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
6 changes: 0 additions & 6 deletions docs/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ export default defineNuxtConfig({
}
},

future: {
compatibilityVersion: 4
},

compatibilityDate: '2024-07-11',

nitro: {
prerender: {
routes: [
Expand Down
1 change: 1 addition & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@nuxt/image": "^1.10.0",
"@nuxt/ui-pro": "3.1.3",
"@nuxthub/core": "0.9.0",
"better-sqlite3": "^11.10.0",
"nuxt": "catalog:",
"nuxt-llms": "0.1.3",
"nuxt-og-image": "^5.1.7"
Expand Down
8 changes: 3 additions & 5 deletions packages/core/src/runtime/root.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,9 @@ const [DefineTemplate, ReuseTemplate] = createReusableTemplate()
>
<component
:is="component"
v-bind="{
...props,
[combo[0]?.value]: combo1,
[combo[1]?.value]: combo2
}"
:[combo[0]?.value]="combo1"
:[combo[1]?.value]="combo2"
v-bind="props"
v-on="eventHandlers"
/>
</div>
Expand Down
6 changes: 0 additions & 6 deletions packages/devtools/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ export default defineNuxtConfig({

css: ['~/assets/css/main.css'],

future: {
compatibilityVersion: 4
},

compatibilityDate: '2024-04-03',

nitro: {
output: {
publicDir: resolve(__dirname, '../core/dist/client/devtools')
Expand Down
1 change: 1 addition & 0 deletions packages/devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"devDependencies": {
"@compodium/core": "workspace:^",
"@compodium/meta": "workspace:^",
"@iconify-json/lineicons": "^1.2.4",
"@iconify-json/lucide": "^1.2.51",
"@iconify/types": "^2.0.0",
"@types/deep-eql": "^4.0.2"
Expand Down
9 changes: 3 additions & 6 deletions packages/devtools/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { defineVitestConfig } from '@nuxt/test-utils/config'
import { defaultExclude } from 'vitest/config'
import { defineConfig } from 'vitest/config'

export default defineVitestConfig({
export default defineConfig({
test: {
globals: true,
silent: true,
exclude: [...defaultExclude, './test/vue/**.spec.ts'],
environment: 'nuxt'
silent: true
}
})
2 changes: 1 addition & 1 deletion packages/examples/src/assets/ui/index.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! tailwindcss v4.1.8 | MIT License | https://tailwindcss.com */
/*! tailwindcss v4.1.10 | MIT License | https://tailwindcss.com */
@layer properties;
:root, :host {
--spacing: 0.25rem;
Expand Down
4 changes: 3 additions & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
"release": "pnpm run lint && pnpm run test && pnpm run prepack && changelogen --release && pnpm publish && git push --follow-tags",
"typecheck": "vue-tsc --noEmit"
},
"peerDependencies": {
"@nuxt/kit": ">=3.15"
},
"dependencies": {
"@compodium/core": "workspace:^",
"@nuxt/devtools-kit": "^2.5.0",
"@nuxt/kit": "catalog:",
"consola": "^3.4.2",
"defu": "^6.1.4",
"ufo": "^1.6.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('basic', async () => {
it('works for basic component', async () => {
const component = await $fetch(`/__compodium__/api/meta`, {
query: {
component: joinURL(rootDir, '/components/BasicComponent.vue')
component: joinURL(rootDir, '/app/components/BasicComponent.vue')
}
})

Expand Down Expand Up @@ -131,7 +131,7 @@ describe('basic', async () => {
it('works', async () => {
const component = await $fetch<CompodiumMeta>('/__compodium__/api/meta', {
query: {
component: joinURL(rootDir, '/components/ExtendMeta.vue')
component: joinURL(rootDir, '/app/components/ExtendMeta.vue')
}
})
expect(component.compodium).toMatchObject({
Expand All @@ -150,7 +150,7 @@ describe('basic', async () => {
it('filters variables', async () => {
const component = await $fetch<CompodiumMeta>('/__compodium__/api/meta', {
query: {
component: joinURL(rootDir, '/components/ExtendMetaWithVars.vue')
component: joinURL(rootDir, '/app/components/ExtendMetaWithVars.vue')
}
})
expect(component.compodium).toEqual({ defaultProps: {} })
Expand All @@ -159,7 +159,7 @@ describe('basic', async () => {
it('ignores if invalid param', async () => {
const component = await $fetch<CompodiumMeta>('/__compodium__/api/meta', {
query: {
component: joinURL(rootDir, '/components/ExtendMetaBad.vue')
component: joinURL(rootDir, '/app/components/ExtendMetaBad.vue')
}
})
expect(component.compodium).toBeUndefined()
Expand All @@ -172,7 +172,7 @@ describe('basic', async () => {
beforeEach(async () => {
const component = await $fetch<CompodiumMeta>('/__compodium__/api/meta', {
query: {
component: joinURL(rootDir, '/components/ComplexComponent.vue')
component: joinURL(rootDir, '/app/components/ComplexComponent.vue')
}
})
props = component.props
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions packages/nuxt/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { defineVitestConfig } from '@nuxt/test-utils/config'
import { defaultExclude } from 'vitest/config'

export default defineVitestConfig({
test: {
globals: true,
silent: true,
exclude: [...defaultExclude, './test/vue/**.spec.ts'],
environment: 'nuxt',
env: {
COMPODIUM_DEVTOOLS_URL: 'http://localhost:4242'
}
Expand Down
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions playgrounds/nuxt/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
export default defineNuxtConfig({
modules: ['@nuxt/ui', '../../packages/nuxt/src/module'],
modules: ['@nuxt/ui', '@compodium/nuxt'],
devtools: { enabled: true },
css: ['~/assets/css/main.css'],
compatibilityDate: '2025-02-12',

typescript: {
tsConfig: {
Expand Down
2 changes: 1 addition & 1 deletion playgrounds/nuxt/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "./.nuxt/tsconfig.json",
"extends": "./.nuxt/tsconfig.json"
}
8 changes: 8 additions & 0 deletions playgrounds/vue/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,16 @@ import ui from '@nuxt/ui/vue-plugin'
import App from './App.vue'
import './assets/main.css'

import { createRouter, createWebHashHistory } from 'vue-router'

const app = createApp(App)

const router = createRouter({
history: createWebHashHistory(),
routes: []
})

app.use(router)
app.use(ui)

app.mount('#app')
Loading