Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
GaborTorma authored Dec 3, 2024
2 parents 5f601a3 + 3df407b commit 5226f0b
Show file tree
Hide file tree
Showing 19 changed files with 1,513 additions and 1,187 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelogensets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand All @@ -54,7 +54,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
cache: "pnpm"

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
registry-url: "https://registry.npmjs.org/"
cache: "pnpm"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- run: corepack enable
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20
node-version: 22
registry-url: "https://registry.npmjs.org/"
cache: "pnpm"

Expand Down
6 changes: 3 additions & 3 deletions examples/app-cucumber/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"test": "NODE_OPTIONS='--loader ts-node/esm' NODE_ENV=test cucumber-js"
},
"dependencies": {
"nuxt": "^3.14.159",
"vue": "^3.5.12",
"nuxt": "^3.14.1592",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@cucumber/cucumber": "11.0.1",
"@cucumber/cucumber": "11.1.0",
"@nuxt/test-utils": "latest",
"ts-node": "10.9.2"
}
Expand Down
6 changes: 3 additions & 3 deletions examples/app-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"test": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js"
},
"dependencies": {
"nuxt": "^3.14.159",
"vue": "^3.5.12",
"nuxt": "^3.14.1592",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@nuxt/test-utils": "latest",
"@types/jest": "29.5.14",
"jest": "29.7.0",
"playwright-core": "1.48.2",
"playwright-core": "1.49.0",
"ts-jest": "29.2.5",
"ts-node": "10.9.2",
"typescript": "5.6.3"
Expand Down
6 changes: 3 additions & 3 deletions examples/app-playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"test": "playwright test"
},
"dependencies": {
"nuxt": "^3.14.159",
"vue": "^3.5.12",
"nuxt": "^3.14.1592",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@nuxt/test-utils": "latest",
"@playwright/test": "1.48.2",
"@playwright/test": "1.49.0",
"std-env": "3.8.0"
}
}
6 changes: 3 additions & 3 deletions examples/app-vitest-full/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"@nuxt/devtools": "1.3.9",
"@nuxt/test-utils": "latest",
"@testing-library/vue": "8.1.0",
"happy-dom": "15.11.0",
"happy-dom": "15.11.6",
"jsdom": "25.0.1",
"listhen": "1.9.0",
"nuxt": "3.14.159",
"nuxt": "3.14.1592",
"typescript": "5.6.3",
"vitest": "2.1.4",
"vitest": "2.1.8",
"vue-tsc": "2.1.10"
},
"dependencies": {
Expand Down
4 changes: 1 addition & 3 deletions examples/app-vitest-full/tests/nuxt/mount-suspended.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,13 @@ describe('mountSuspended', () => {
`)
})

// This test works (you can delete it later)
it('can receive emitted events from components using defineModel', () => {
const component = mount(WrapperTests)
component.find('button#changeModelValue').trigger('click')
expect(component.emitted()).toHaveProperty('update:modelValue')
})

// FIXME: fix this failing test
it.todo('can receive emitted events from components mounted within nuxt suspense using defineModel', async () => {
it('can receive emitted events from components mounted within nuxt suspense using defineModel', async () => {
const component = await mountSuspended(WrapperTests)
component.find('button#changeModelValue').trigger('click')
expect(component.emitted()).toHaveProperty('update:modelValue')
Expand Down
10 changes: 5 additions & 5 deletions examples/app-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"test": "vitest run"
},
"dependencies": {
"nuxt": "^3.14.159",
"vue": "^3.5.12",
"nuxt": "^3.14.1592",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@nuxt/test-utils": "latest",
"globby": "14.0.2",
"happy-dom": "15.11.0",
"playwright-core": "1.48.2",
"happy-dom": "15.11.6",
"playwright-core": "1.49.0",
"typescript": "5.6.3",
"vitest": "2.1.4"
"vitest": "2.1.8"
}
}
4 changes: 2 additions & 2 deletions examples/content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@nuxt/content": "2.13.4",
"@nuxt/test-utils": "latest",
"nuxt": "3.14.159",
"vitest": "2.1.4"
"nuxt": "3.14.1592",
"vitest": "2.1.8"
}
}
8 changes: 4 additions & 4 deletions examples/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"devDependencies": {
"@nuxt/devtools": "1.0.8",
"@nuxt/test-utils": "latest",
"@nuxtjs/i18n": "9.0.0",
"nuxt": "3.14.159",
"vitest": "2.1.4",
"vue": "3.5.12",
"@nuxtjs/i18n": "9.1.0",
"nuxt": "3.14.1592",
"vitest": "2.1.8",
"vue": "3.5.13",
"vue-router": "4.4.5"
}
}
10 changes: 5 additions & 5 deletions examples/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"test:watch": "vitest watch"
},
"dependencies": {
"@nuxt/kit": "^3.14.159",
"vue": "^3.5.12",
"@nuxt/kit": "^3.14.1592",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@nuxt/module-builder": "0.8.4",
"@nuxt/schema": "3.14.159",
"@nuxt/schema": "3.14.1592",
"@nuxt/test-utils": "latest",
"changelogen": "0.5.7",
"nuxt": "3.14.159",
"vitest": "2.1.4"
"nuxt": "3.14.1592",
"vitest": "2.1.8"
}
}
4 changes: 2 additions & 2 deletions examples/module/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"generate": "nuxi generate"
},
"devDependencies": {
"nuxt": "3.14.159"
"nuxt": "3.14.1592"
},
"dependencies": {
"vue": "^3.5.12",
"vue": "^3.5.13",
"vue-router": "^4.4.5"
}
}
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"release": "pnpm prepack && pnpm test:examples && changelogen --release --push"
},
"dependencies": {
"@nuxt/kit": "^3.14.159",
"@nuxt/schema": "^3.14.159",
"@nuxt/kit": "^3.14.1592",
"@nuxt/schema": "^3.14.1592",
"c12": "^2.0.1",
"consola": "^3.2.3",
"defu": "^6.1.4",
"destr": "^2.0.3",
"estree-walker": "^3.0.3",
"fake-indexeddb": "^6.0.0",
"get-port-please": "^3.1.2",
"local-pkg": "^0.5.0",
"magic-string": "^0.30.12",
"local-pkg": "^0.5.1",
"magic-string": "^0.30.13",
"node-fetch-native": "^1.6.4",
"ofetch": "^1.4.1",
"pathe": "^1.1.2",
Expand All @@ -61,37 +61,37 @@
"tinyexec": "^0.3.1",
"ufo": "^1.5.4",
"unenv": "^1.10.0",
"unplugin": "^1.15.0",
"unplugin": "^1.16.0",
"vitest-environment-nuxt": "^1.0.1"
},
"devDependencies": {
"@cucumber/cucumber": "11.0.1",
"@cucumber/cucumber": "11.1.0",
"@jest/globals": "29.7.0",
"@nuxt/devtools": "1.0.8",
"@nuxt/eslint-config": "0.6.1",
"@nuxt/eslint-config": "0.7.1",
"@nuxt/module-builder": "0.8.4",
"@playwright/test": "1.48.2",
"@playwright/test": "1.49.0",
"@testing-library/vue": "8.1.0",
"@types/estree": "1.0.6",
"@types/jsdom": "21.1.7",
"@types/semver": "7.5.8",
"@vitest/ui": "2.1.4",
"@vitest/ui": "2.1.8",
"@vue/test-utils": "2.4.6",
"changelogen": "0.5.7",
"compatx": "0.1.8",
"eslint": "9.14.0",
"eslint": "9.15.0",
"h3": "1.13.0",
"jiti": "2.4.0",
"nitropack": "2.10.4",
"nuxt": "3.14.159",
"playwright-core": "1.48.2",
"rollup": "4.25.0",
"nuxt": "3.14.1592",
"playwright-core": "1.49.0",
"rollup": "4.27.3",
"semver": "7.6.3",
"typescript": "5.6.3",
"unbuild": "latest",
"unimport": "3.13.1",
"vite": "5.4.10",
"vitest": "2.1.4",
"unimport": "3.13.2",
"vite": "5.4.11",
"vitest": "2.1.8",
"vue-router": "4.4.5",
"vue-tsc": "2.1.10"
},
Expand Down Expand Up @@ -145,19 +145,19 @@
}
},
"resolutions": {
"@cucumber/cucumber": "11.0.1",
"@cucumber/cucumber": "11.1.0",
"@nuxt/devtools": "1.0.8",
"@nuxt/kit": "^3.14.159",
"@nuxt/schema": "^3.14.159",
"@nuxt/kit": "^3.14.1592",
"@nuxt/schema": "^3.14.1592",
"@nuxt/test-utils": "workspace:*",
"rollup": "4.25.0",
"vite": "5.4.10",
"vite-node": "2.1.4",
"vitest": "2.1.4",
"vue": "^3.5.12"
"rollup": "4.27.3",
"vite": "5.4.11",
"vite-node": "2.1.8",
"vitest": "2.1.8",
"vue": "^3.5.13"
},
"engines": {
"node": ">=22.11.0"
},
"packageManager": "pnpm@9.12.3"
"packageManager": "pnpm@9.14.2"
}
Loading

0 comments on commit 5226f0b

Please sign in to comment.