deytenit/ermnvldmr.com
1
0 Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

fix: Fix tailwind and type issues in www

Browse Source
This commit is contained in:
deytenit committed 2026-01-27 00:01:31 +03:00
1 parent 439dabc118
commit bc87ca601e
11 files changed
+91 -116
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/packages-ui-next-required.yml
+5 -36
View File
@@ -66,34 +66,9 @@ jobs:
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
build-dependencies:
name: Build - Dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Build Jest config
run: pnpm --filter @ermnvldmr/jest-config build
- name: Build Vite config
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
lint-ui:
name: Lint - UI
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -114,7 +89,7 @@ jobs:
typecheck-ui:
name: Typecheck - UI
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -135,7 +110,7 @@ jobs:
test-ui:
name: Test - UI & Storybook
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -155,8 +130,6 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Test STL package
run: pnpm --filter @ermnvldmr/stl test:coverage
- name: Test UI package
@@ -171,7 +144,7 @@ jobs:
build-storybook:
name: Build - Storybook
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -191,8 +164,6 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
- name: Build UI Storybook
@@ -200,7 +171,7 @@ jobs:
build-ui:
name: Build - UI
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -220,7 +191,5 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
.github/workflows/services-www-next-required.yml
+4 -43
View File
@@ -67,36 +67,9 @@ jobs:
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
build-dependencies:
name: Build - Dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9.12.3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
- name: Install dependencies
run: pnpm install --frozen-lockfile
- name: Build Jest config
run: pnpm --filter @ermnvldmr/jest-config build
- name: Build Vite config
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
lint-www:
name: Lint - WWW & Deps
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -119,7 +92,7 @@ jobs:
typecheck-www:
name: Typecheck - WWW & Deps
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -142,7 +115,7 @@ jobs:
build-storybook:
name: Build - Storybook
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -162,10 +135,6 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
- name: Build WWW Storybook
run: pnpm --filter @ermnvldmr/www build-storybook
- name: Upload Storybook build
@@ -199,10 +168,6 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
- name: Test STL package
run: pnpm --filter @ermnvldmr/stl test:coverage
- name: Test UI package
@@ -226,7 +191,7 @@ jobs:
build-www:
name: Build - WWW Service
needs: build-dependencies
needs: build-configs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
@@ -246,10 +211,6 @@ jobs:
run: pnpm --filter @ermnvldmr/vite-config build
- name: Build Storybook config
run: pnpm --filter @ermnvldmr/storybook-config build
- name: Build STL package
run: pnpm --filter @ermnvldmr/stl build
- name: Build UI package
run: pnpm --filter @ermnvldmr/ui build
- name: Build WWW service
run: pnpm --filter @ermnvldmr/www build
ci/docker/www/Dockerfile
+1 -5
View File
@@ -24,11 +24,7 @@ RUN pnpm install --frozen-lockfile
# Copy source code
COPY . .
# Build dependencies and then the website
RUN pnpm --filter @ermnvldmr/jest-config build
RUN pnpm --filter @ermnvldmr/vite-config build
RUN pnpm --filter @ermnvldmr/stl build
RUN pnpm --filter @ermnvldmr/ui build
# Build the website
RUN pnpm --filter @ermnvldmr/www build
# Stage 2: Runtime
eslint.config.mjs
+1 -1
View File
@@ -22,7 +22,7 @@ export default tseslint.config(
// Astro
...eslintPluginAstro.configs.recommended,
{
files: ['services/www/**/*.astro'],
files: ['services/www/**/*.astro', 'services/static/**/*.astro'],
rules: {
// Astro specific rules can go here
},
package.json
+5
View File
@@ -28,8 +28,13 @@
"www:storybook": "pnpm --filter @ermnvldmr/www storybook",
"docs:dev": "pnpm --filter @ermnvldmr/docs dev",
"docs:build": "pnpm --filter @ermnvldmr/docs build",
"static:dev": "pnpm --filter @ermnvldmr/static dev",
"static:build": "pnpm --filter @ermnvldmr/static build",
"static:lint": "pnpm --filter @ermnvldmr/static lint",
"static:typecheck": "pnpm --filter @ermnvldmr/static typecheck",
"dev:ui": "pnpm ui:dev",
"dev:www": "pnpm ui:build && pnpm www:dev",
"dev:static": "pnpm ui:build && pnpm static:dev",
"dev:docs": "pnpm docs:dev",
"build": "pnpm ui:build && pnpm -r --filter='./services/*' build",
"build:storybooks": "pnpm ui:build && pnpm --filter @ermnvldmr/ui build-storybook && pnpm --filter @ermnvldmr/www build-storybook",
pnpm-lock.yaml
Generated
+65 -17
View File
@@ -83,13 +83,13 @@ importers:
version: 30.0.0
jest:
specifier: ^30.2.0
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
jest-environment-jsdom:
specifier: ^30.2.0
version: 30.2.0
ts-jest:
specifier: ^29.4.6
version: 29.4.6(@babel/core@7.28.6)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.28.6))(esbuild@0.27.2)(jest-util@30.2.0)(jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)))(typescript@5.8.3)
version: 29.4.6(@babel/core@7.28.6)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.28.6))(esbuild@0.27.2)(jest-util@30.2.0)(jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2)))(typescript@5.8.3)
devDependencies:
typescript:
specifier: ^5.8.3
@@ -118,7 +118,7 @@ importers:
version: link:../vite-config
jest:
specifier: ^30.2.0
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
typescript:
specifier: ^5.8.3
version: 5.8.3
@@ -249,7 +249,7 @@ importers:
version: 19.2.3(@types/react@19.2.9)
jest:
specifier: ^30.2.0
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.25.12))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
jest-environment-jsdom:
specifier: ^30.2.0
version: 30.2.0
@@ -288,6 +288,52 @@ importers:
specifier: workspace:*
version: link:../../packages/eslint-config
services/static:
dependencies:
'@astrojs/react':
specifier: ^4.2.5
version: 4.4.2(@types/node@25.0.10)(@types/react-dom@19.2.3(@types/react@19.2.9))(@types/react@19.2.9)(jiti@2.6.1)(lightningcss@1.30.2)(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
'@ermnvldmr/stl':
specifier: workspace:*
version: link:../../packages/stl
'@ermnvldmr/ui':
specifier: workspace:*
version: link:../../packages/ui
astro:
specifier: ^5.7.5
version: 5.16.15(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2)(rollup@4.56.0)(typescript@5.8.3)
react:
specifier: ^19.1.0
version: 19.2.3
react-dom:
specifier: ^19.1.0
version: 19.2.3(react@19.2.3)
tailwindcss:
specifier: ^4.1.4
version: 4.1.18
devDependencies:
'@ermnvldmr/eslint-config':
specifier: workspace:*
version: link:../../packages/eslint-config
'@tailwindcss/vite':
specifier: ^4.1.4
version: 4.1.18(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2))
eslint:
specifier: ^9.25.1
version: 9.39.2(jiti@2.6.1)
prettier:
specifier: ^3.5.3
version: 3.5.3
prettier-plugin-astro:
specifier: ^0.14.1
version: 0.14.1
prettier-plugin-tailwindcss:
specifier: ^0.6.11
version: 0.6.14(prettier-plugin-astro@0.14.1)(prettier@3.5.3)
typescript:
specifier: ^5.8.3
version: 5.8.3
services/www:
dependencies:
'@astrojs/mdx':
@@ -345,6 +391,9 @@ importers:
'@storybook/test-runner':
specifier: ^0.19.1
version: 0.19.1(@swc/helpers@0.5.18)(@types/node@25.0.10)(storybook@8.6.15(prettier@3.5.3))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
'@tailwindcss/vite':
specifier: ^4.1.4
version: 4.1.18(vite@7.3.1(@types/node@25.0.10)(jiti@2.6.1)(lightningcss@1.30.2))
'@testing-library/jest-dom':
specifier: ^6.9.1
version: 6.9.1
@@ -368,7 +417,7 @@ importers:
version: 14.1.1
jest:
specifier: ^30.2.0
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
version: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.25.12))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
jest-environment-jsdom:
specifier: ^30.2.0
version: 30.2.0
@@ -8490,7 +8539,7 @@ snapshots:
- supports-color
- ts-node
'@jest/core@30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))':
'@jest/core@30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))':
dependencies:
'@jest/console': 30.2.0
'@jest/pattern': 30.0.1
@@ -8505,7 +8554,7 @@ snapshots:
exit-x: 0.2.2
graceful-fs: 4.2.11
jest-changed-files: 30.2.0
jest-config: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
jest-config: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
jest-haste-map: 30.2.0
jest-message-util: 30.2.0
jest-regex-util: 30.0.1
@@ -13557,15 +13606,15 @@ snapshots:
- supports-color
- ts-node
jest-cli@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)):
jest-cli@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2)):
dependencies:
'@jest/core': 30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
'@jest/core': 30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))
'@jest/test-result': 30.2.0
'@jest/types': 30.2.0
chalk: 4.1.2
exit-x: 0.2.2
import-local: 3.2.0
jest-config: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
jest-config: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
jest-util: 30.2.0
jest-validate: 30.2.0
yargs: 17.7.2
@@ -13641,7 +13690,7 @@ snapshots:
- babel-plugin-macros
- supports-color
jest-config@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)):
jest-config@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2)):
dependencies:
'@babel/core': 7.28.6
'@jest/get-type': 30.1.0
@@ -13670,7 +13719,6 @@ snapshots:
optionalDependencies:
'@types/node': 25.0.10
esbuild-register: 3.6.0(esbuild@0.27.2)
ts-node: 10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)
transitivePeerDependencies:
- babel-plugin-macros
- supports-color
@@ -14196,12 +14244,12 @@ snapshots:
- supports-color
- ts-node
jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)):
jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2)):
dependencies:
'@jest/core': 30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
'@jest/core': 30.2.0(esbuild-register@3.6.0(esbuild@0.27.2))
'@jest/types': 30.2.0
import-local: 3.2.0
jest-cli: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
jest-cli: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
transitivePeerDependencies:
- '@types/node'
- babel-plugin-macros
@@ -16221,12 +16269,12 @@ snapshots:
ts-dedent@2.2.0: {}
ts-jest@29.4.6(@babel/core@7.28.6)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.28.6))(esbuild@0.27.2)(jest-util@30.2.0)(jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3)))(typescript@5.8.3):
ts-jest@29.4.6(@babel/core@7.28.6)(@jest/transform@30.2.0)(@jest/types@30.2.0)(babel-jest@30.2.0(@babel/core@7.28.6))(esbuild@0.27.2)(jest-util@30.2.0)(jest@30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2)))(typescript@5.8.3):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0
handlebars: 4.7.8
jest: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))(ts-node@10.9.2(@swc/core@1.15.10(@swc/helpers@0.5.18))(@types/node@25.0.10)(typescript@5.8.3))
jest: 30.2.0(@types/node@25.0.10)(esbuild-register@3.6.0(esbuild@0.27.2))
json5: 2.2.3
lodash.memoize: 4.1.2
make-error: 1.3.6
services/www/astro.config.mjs
+3
View File
@@ -2,6 +2,7 @@
import mdx from '@astrojs/mdx';
import react from '@astrojs/react';
import sitemap from '@astrojs/sitemap';
import tailwindcss from '@tailwindcss/vite';
import { defineConfig } from 'astro/config';
// https://astro.build/config
@@ -12,8 +13,10 @@ export default defineConfig({
integrations: [mdx(), sitemap(), react()],
vite: {
plugins: [tailwindcss()],
resolve: {
alias: {
'@ermnvldmr/stl': new URL('../../packages/stl/src', import.meta.url).pathname,
'@ermnvldmr/ui': new URL('../../packages/ui/src', import.meta.url).pathname,
'#': new URL('./src/', import.meta.url).pathname,
},
services/www/package.json
+1
View File
@@ -43,6 +43,7 @@
"@storybook/react": "^8.6.15",
"@storybook/react-vite": "^8.6.15",
"@storybook/test-runner": "^0.19.1",
"@tailwindcss/vite": "^4.1.4",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.1",
"@testing-library/user-event": "^14.6.1",
services/www/src/global.css
+2 -1
View File
@@ -1 +1,2 @@
@import '@ermnvldmr/ui/styles';
@import "../../../packages/ui/src/styles/index.css";
@source "../../../packages/ui/src";
services/www/tailwind.config.mjs
-12
View File
@@ -1,12 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
'./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}',
'../../packages/ui/src/**/*.{js,jsx,ts,tsx}'
],
darkMode: 'class',
theme: {
extend: {},
},
plugins: [],
};
services/www/tsconfig.json
+4 -1
View File
@@ -3,7 +3,10 @@
"compilerOptions": {
"baseUrl": "./src",
"paths": {
"#*": ["./*"]
"#*": ["./*"],
"@ermnvldmr/stl": ["../../../packages/stl/src"],
"@ermnvldmr/ui": ["../../../packages/ui/src"],
"@ermnvldmr/ui/*": ["../../../packages/ui/src/*"]
}
},
"include": [".astro/types.d.ts", "src/**/*", ".storybook/**/*"],