Skip to content

Commit 86ea918

Browse files
committed
chore: upgrade deps. pwa plugin has type errors
1 parent 93a3efa commit 86ea918

File tree

19 files changed

+1972
-1351
lines changed

19 files changed

+1972
-1351
lines changed

.npmrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
shamefully-hoist=true
22
ignore-workspace-root-check=true
3-
strict-peer-dependencies=true
3+
strict-peer-dependencies=false
4+
auto-install-peers=true

docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
"@islands/icons": "workspace:*",
2323
"@islands/prism": "workspace:*",
2424
"@islands/pwa": "workspace:*",
25-
"@preact/preset-vite": "^2.1.5",
25+
"@preact/preset-vite": "^2.5.0",
2626
"@types/cross-spawn": "^6.0.2",
2727
"@vueuse/core": "^6.9.2",
2828
"autoprefixer": "^10.4.0",
2929
"cross-spawn": "^7.0.3",
3030
"iles": "workspace:*",
3131
"postcss-nesting": "^8.0.1",
3232
"preact": "^10.11.2",
33-
"preact-render-to-string": "^5.2.0",
33+
"preact-render-to-string": "^6.1.0",
3434
"rehype-external-links": "^1.0.0",
35-
"vite-plugin-inspect": "^0.5.1",
36-
"vite-plugin-windicss": "^1.6.3",
35+
"vite-plugin-inspect": "^0.7.29",
36+
"vite-plugin-windicss": "^1.9.0",
3737
"vue-tsc": "^0.29.8"
3838
},
3939
"dependencies": {

packages/feed/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
"bugs": "https://github.com/ElMassimo/iles/issues",
3030
"devDependencies": {
3131
"iles": "workspace:*",
32-
"vue": "^3.2.45"
32+
"vue": "^3.3.4"
3333
},
3434
"peerDependencies": {
3535
"iles": "workspace:*",
36-
"vue": "^3.2.45"
36+
"vue": "^3.3.4"
3737
},
3838
"dependencies": {
3939
"feed": "^4.2",

packages/hydration/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
"url": "https://github.com/ElMassimo/iles/issues"
3838
},
3939
"devDependencies": {
40-
"preact": "^10.11.2",
41-
"preact-render-to-string": "^5.2.0",
42-
"solid-js": "^1.5.7",
43-
"svelte": "^3.52.0",
40+
"preact": "^10.15.1",
41+
"preact-render-to-string": "^6.1.0",
42+
"solid-js": "^1.7.6",
43+
"svelte": "^4.0.0",
4444
"tsup": "6.1.2",
4545
"typescript": "^4.4.4",
46-
"vite": "^4.3.0-beta.1",
47-
"vue": "^3.2.45"
46+
"vite": "^4.4.0-beta.3",
47+
"vue": "^3.3.4"
4848
}
4949
}

packages/hydration/svelte.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-ignore
12
import { HtmlTag, empty, insert, detach } from 'svelte/internal'
23
import type { Props, Slots } from './types'
34
import { onDispose } from './hydration'

packages/iles/package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,18 @@
6060
"url": "https://github.com/ElMassimo/iles/issues"
6161
},
6262
"dependencies": {
63-
"@antfu/install-pkg": "^0.1.0",
63+
"@antfu/install-pkg": "^0.1.1",
6464
"@islands/hydration": "workspace:^0.8.0",
6565
"@islands/mdx": "workspace:^0.9.0",
6666
"@islands/pages": "workspace:^0.8.0",
6767
"@islands/prerender": "workspace:^0.8.0",
6868
"@nuxt/devalue": "^2.0.0",
69-
"@vitejs/plugin-vue": "^4.0.0",
70-
"@vue/devtools-api": "^6.4.5",
71-
"@vue/server-renderer": "^3.2.45",
69+
"@vitejs/plugin-vue": "^4.2.3",
70+
"@vue/devtools-api": "^6.5.0",
7271
"@vueuse/head": "^1.0.22",
7372
"debug": "^4.3.2",
7473
"deep-equal": "^2.0.5",
75-
"es-module-lexer": "^0.7.1",
74+
"es-module-lexer": "^1.3.0",
7675
"fast-glob": "^3.2.11",
7776
"local-pkg": "^0.4.0",
7877
"mico-spinner": "^1.4.0",
@@ -81,14 +80,14 @@
8180
"pathe": "^0.2.0",
8281
"picocolors": "^1.0.0",
8382
"unist-util-visit": "^4.1.0",
84-
"unplugin-vue-components": "^0.21.1",
85-
"vite": "^4.3.0-beta.1",
86-
"vue": "^3.2.45",
87-
"vue-router": "^4.0.12"
83+
"unplugin-vue-components": "^0.25.1",
84+
"vite": "^4.4.0-beta.3",
85+
"vue": "^3.3.4",
86+
"vue-router": "^4.2.2"
8887
},
8988
"devDependencies": {
90-
"@preact/preset-vite": "^2.4.0",
91-
"@sveltejs/vite-plugin-svelte": "^1.0.9",
89+
"@preact/preset-vite": "^2.5.0",
90+
"@sveltejs/vite-plugin-svelte": "^2.4.2",
9291
"@types/debug": "^4.1.7",
9392
"@types/fs-extra": "^9.0.12",
9493
"@types/micromatch": "^4.0.2",
@@ -111,7 +110,7 @@
111110
"tsup": "6.1.2",
112111
"typescript": "^4.4.4",
113112
"vfile": "^5.2.0",
114-
"vite-plugin-solid": "^2.3.9"
113+
"vite-plugin-solid": "^2.7.0"
115114
},
116115
"pnpm": {
117116
"overrides": {

packages/iles/src/client/app/composables/vueRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function useVueRenderer (): VNodeRenderer {
2828
// Set the external app context to the temporary app.
2929
Object.assign(proxyApp._context, { ...appContext, provides })
3030

31-
const { renderToString } = await import('@vue/server-renderer')
31+
const { renderToString } = await import('vue/server-renderer')
3232
return await renderToString(proxyApp, ssrContext)
3333
}) as VNodeRenderer, getCurrentInstance()) as VNodeRenderer
3434
}

packages/iles/src/node/build/bundle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async function bundleWithVite (config: AppConfig, entrypoints: string[] | Entryp
4343
return await build(mergeViteConfig(config.vite, {
4444
logLevel: config.vite.logLevel ?? 'warn',
4545
ssr: {
46-
external: ['vue', '@vue/server-renderer'],
46+
external: ['vue', 'vue/server-renderer'],
4747
noExternal: ['iles'],
4848
},
4949
plugins: [

packages/iles/src/node/build/render.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { renderHeadToString } from '@vueuse/head'
55
import type { RollupOutput } from 'rollup'
66
import { renderers } from '@islands/prerender'
77
import { IslandDefinition } from 'iles'
8-
import { renderToString } from '@vue/server-renderer'
8+
import { renderToString } from 'vue/server-renderer'
99
import type { Awaited, AppConfig, CreateAppFactory, IslandsByPath, RouteToRender } from '../shared'
1010
import type { bundle } from './bundle'
1111
import { withSpinner } from './utils'

packages/iles/src/node/build/routes.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ async function resolveRoutesToRender (router: Router) {
3636
}
3737

3838
async function getDynamicPaths (route: RouteRecordNormalized) {
39-
const { components: { default: component }, path } = route
39+
const { components, path } = route
4040
const file = path
41+
const { default: component } = components || {}
4142

4243
const page: PageComponent | undefined = isLazy(component)
4344
? await component().then(m => 'default' in m ? m.default : m)
@@ -55,7 +56,7 @@ async function getDynamicPaths (route: RouteRecordNormalized) {
5556
({ name: route.name, params, ssrProps: { ...params, ...props } }))
5657
}
5758

58-
function isLazy (value: RouteRecordNormalized['components']['default']): value is () => Promise<RouteComponent> {
59+
function isLazy (value: NonNullable<RouteRecordNormalized['components']>['default']): value is () => Promise<RouteComponent> {
5960
return typeof value === 'function'
6061
}
6162

0 commit comments

Comments
 (0)