diff --git a/ui/prototype/package-lock.json b/ui/prototype/package-lock.json index 6b2a62cf95..1c47cdce7e 100644 --- a/ui/prototype/package-lock.json +++ b/ui/prototype/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@tailwindcss/vite": "4.2.2", "@vitejs/plugin-vue": "^6.0.5", + "tailwind-merge": "^3.5.0", "tailwindcss": "4.2.2", "typescript": "^5.9.3", "vite": "^8.0.0", @@ -1306,6 +1307,16 @@ "node": ">=0.10.0" } }, + "node_modules/tailwind-merge": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", + "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.2.tgz", diff --git a/ui/prototype/package.json b/ui/prototype/package.json index d456e72160..b16d11d70d 100644 --- a/ui/prototype/package.json +++ b/ui/prototype/package.json @@ -12,6 +12,7 @@ "dependencies": { "@tailwindcss/vite": "4.2.2", "@vitejs/plugin-vue": "^6.0.5", + "tailwind-merge": "^3.5.0", "tailwindcss": "4.2.2", "typescript": "^5.9.3", "vite": "^8.0.0", diff --git a/ui/prototype/scripts/check-prototype.mjs b/ui/prototype/scripts/check-prototype.mjs index c6c9616a42..8c61b7ea56 100644 --- a/ui/prototype/scripts/check-prototype.mjs +++ b/ui/prototype/scripts/check-prototype.mjs @@ -4,10 +4,6 @@ import { join, relative } from 'node:path' const root = new URL('..', import.meta.url).pathname const srcRoot = join(root, 'src') -function read(path) { - return readFileSync(join(root, path), 'utf8') -} - function walk(dir) { return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => { const path = join(dir, entry.name) @@ -19,40 +15,6 @@ function walk(dir) { const failures = [] const sourceFiles = walk(srcRoot).filter((path) => /\.(ts|vue|css)$/.test(path)) -const prototypeBlockItem = read('src/components/editor/UIBlockItem.vue') -const prototypeBlockItemTitle = read('src/components/editor/UIBlockItemTitle.vue') -const prototypeEditorSpriteItem = read('src/components/editor/UIEditorSpriteItem.vue') -const prototypeSpriteItem = read('src/components/editor/SpriteItem.vue') - -if ( - prototypeBlockItem.includes('