Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Update npm to latest (required for OIDC)
run: npm install -g npm@latest
- name: Disable pre- and post-publish actions
run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
- name: Disable publish and install actions
run: 'sed -i -E "s/\"((pre|post)(publish|install))/\"ignore:\1/" package.json'
- name: Publish to npm
if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]'
run: npm publish --tag latest
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 6 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "solid-ui",
"version": "3.1.3-1",
"version": "3.1.3-4",
"description": "UI library for Solid applications",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
Expand All @@ -21,25 +21,11 @@
"import": "./dist/components/*/index.esm.js",
"require": "./dist/components/*/index.cjs.js"
},
"./components/actions/button": {
"types": "./dist/components/button/index.d.ts",
"import": "./dist/components/button/index.esm.js",
"require": "./dist/components/button/index.cjs.js"
},
"./components/forms/select": {
"types": "./dist/components/select/index.d.ts",
"import": "./dist/components/select/index.esm.js",
"require": "./dist/components/select/index.cjs.js"
},
"./components/forms/combobox": {
"types": "./dist/components/combobox/index.d.ts",
"import": "./dist/components/combobox/index.esm.js",
"require": "./dist/components/combobox/index.cjs.js"
},
"./components/media/photo-capture": {
"types": "./dist/components/photo-capture/index.d.ts",
"import": "./dist/components/photo-capture/index.esm.js",
"require": "./dist/components/photo-capture/index.cjs.js"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is an example of losing compatibility. Here with current dev mashlib package.
This was introduced to remove mashlib build errors in the UVDSL test.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ok, but the correct fix here would be to remove the legacy imports from any pane that is still using them, rather than adding them back.

"./theme.css": {
"style": "./dist/theme.css",
"types": "./dist/theme.css.d.ts",
"import": "./dist/theme.css",
"require": "./dist/theme.css"
}
},
"files": [
Expand Down
19 changes: 16 additions & 3 deletions vite-config/styles.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
import { resolve } from 'node:path'
import { writeFileSync } from 'node:fs'
import { join, resolve } from 'node:path'
import tailwindcss from '@tailwindcss/vite'
import type { UserConfig } from 'vite'
import type { Plugin, UserConfig } from 'vite'

const projectRoot = resolve(import.meta.dirname, '..')

function styleDeclarations(): Plugin {
return {
name: 'style-declarations',
closeBundle() {
writeFileSync(
join(projectRoot, 'dist/theme.css.d.ts'),
'export {}\n',
)
},
}
}

export function stylesConfig(): UserConfig {
return {
build: {
Expand All @@ -17,6 +30,6 @@ export function stylesConfig(): UserConfig {
},
},
},
plugins: [tailwindcss()],
plugins: [tailwindcss(), styleDeclarations()],
}
}