chore: upgrade deps. pwa plugin has type errors

ElMassimo · Jun 26, 2023 · 86ea918 · 86ea918
1 parent 93a3efa
commit 86ea918
Show file tree

Hide file tree

Showing 19 changed files with 1,972 additions and 1,351 deletions.
diff --git a/.npmrc b/.npmrc
@@ -1,3 +1,4 @@
 shamefully-hoist=true
 ignore-workspace-root-check=true
-strict-peer-dependencies=true
+strict-peer-dependencies=false
+auto-install-peers=true
diff --git a/docs/package.json b/docs/package.json
@@ -22,18 +22,18 @@
     "@islands/icons": "workspace:*",
     "@islands/prism": "workspace:*",
     "@islands/pwa": "workspace:*",
-    "@preact/preset-vite": "^2.1.5",
+    "@preact/preset-vite": "^2.5.0",
     "@types/cross-spawn": "^6.0.2",
     "@vueuse/core": "^6.9.2",
     "autoprefixer": "^10.4.0",
     "cross-spawn": "^7.0.3",
     "iles": "workspace:*",
     "postcss-nesting": "^8.0.1",
     "preact": "^10.11.2",
-    "preact-render-to-string": "^5.2.0",
+    "preact-render-to-string": "^6.1.0",
     "rehype-external-links": "^1.0.0",
-    "vite-plugin-inspect": "^0.5.1",
-    "vite-plugin-windicss": "^1.6.3",
+    "vite-plugin-inspect": "^0.7.29",
+    "vite-plugin-windicss": "^1.9.0",
     "vue-tsc": "^0.29.8"
   },
   "dependencies": {

diff --git a/packages/feed/package.json b/packages/feed/package.json
@@ -29,11 +29,11 @@
   "bugs": "https://github.com/ElMassimo/iles/issues",
   "devDependencies": {
     "iles": "workspace:*",
-    "vue": "^3.2.45"
+    "vue": "^3.3.4"
   },
   "peerDependencies": {
     "iles": "workspace:*",
-    "vue": "^3.2.45"
+    "vue": "^3.3.4"
   },
   "dependencies": {
     "feed": "^4.2",

diff --git a/packages/hydration/package.json b/packages/hydration/package.json
@@ -37,13 +37,13 @@
     "url": "https://github.com/ElMassimo/iles/issues"
   },
   "devDependencies": {
-    "preact": "^10.11.2",
-    "preact-render-to-string": "^5.2.0",
-    "solid-js": "^1.5.7",
-    "svelte": "^3.52.0",
+    "preact": "^10.15.1",
+    "preact-render-to-string": "^6.1.0",
+    "solid-js": "^1.7.6",
+    "svelte": "^4.0.0",
     "tsup": "6.1.2",
     "typescript": "^4.4.4",
-    "vite": "^4.3.0-beta.1",
-    "vue": "^3.2.45"
+    "vite": "^4.4.0-beta.3",
+    "vue": "^3.3.4"
   }
 }
diff --git a/packages/hydration/svelte.ts b/packages/hydration/svelte.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { HtmlTag, empty, insert, detach } from 'svelte/internal'
 import type { Props, Slots } from './types'
 import { onDispose } from './hydration'

diff --git a/packages/iles/package.json b/packages/iles/package.json
@@ -60,19 +60,18 @@
     "url": "https://github.com/ElMassimo/iles/issues"
   },
   "dependencies": {
-    "@antfu/install-pkg": "^0.1.0",
+    "@antfu/install-pkg": "^0.1.1",
     "@islands/hydration": "workspace:^0.8.0",
     "@islands/mdx": "workspace:^0.9.0",
     "@islands/pages": "workspace:^0.8.0",
     "@islands/prerender": "workspace:^0.8.0",
     "@nuxt/devalue": "^2.0.0",
-    "@vitejs/plugin-vue": "^4.0.0",
-    "@vue/devtools-api": "^6.4.5",
-    "@vue/server-renderer": "^3.2.45",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "@vue/devtools-api": "^6.5.0",
     "@vueuse/head": "^1.0.22",
     "debug": "^4.3.2",
     "deep-equal": "^2.0.5",
-    "es-module-lexer": "^0.7.1",
+    "es-module-lexer": "^1.3.0",
     "fast-glob": "^3.2.11",
     "local-pkg": "^0.4.0",
     "mico-spinner": "^1.4.0",
@@ -81,14 +80,14 @@
     "pathe": "^0.2.0",
     "picocolors": "^1.0.0",
     "unist-util-visit": "^4.1.0",
-    "unplugin-vue-components": "^0.21.1",
-    "vite": "^4.3.0-beta.1",
-    "vue": "^3.2.45",
-    "vue-router": "^4.0.12"
+    "unplugin-vue-components": "^0.25.1",
+    "vite": "^4.4.0-beta.3",
+    "vue": "^3.3.4",
+    "vue-router": "^4.2.2"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.4.0",
-    "@sveltejs/vite-plugin-svelte": "^1.0.9",
+    "@preact/preset-vite": "^2.5.0",
+    "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^9.0.12",
     "@types/micromatch": "^4.0.2",
@@ -111,7 +110,7 @@
     "tsup": "6.1.2",
     "typescript": "^4.4.4",
     "vfile": "^5.2.0",
-    "vite-plugin-solid": "^2.3.9"
+    "vite-plugin-solid": "^2.7.0"
   },
   "pnpm": {
     "overrides": {

diff --git a/packages/iles/src/client/app/composables/vueRenderer.ts b/packages/iles/src/client/app/composables/vueRenderer.ts
@@ -28,7 +28,7 @@ export function useVueRenderer (): VNodeRenderer {
     // Set the external app context to the temporary app.
     Object.assign(proxyApp._context, { ...appContext, provides })
 
-    const { renderToString } = await import('@vue/server-renderer')
+    const { renderToString } = await import('vue/server-renderer')
     return await renderToString(proxyApp, ssrContext)
   }) as VNodeRenderer, getCurrentInstance()) as VNodeRenderer
 }

diff --git a/packages/iles/src/node/build/bundle.ts b/packages/iles/src/node/build/bundle.ts
@@ -43,7 +43,7 @@ async function bundleWithVite (config: AppConfig, entrypoints: string[] | Entryp
   return await build(mergeViteConfig(config.vite, {
     logLevel: config.vite.logLevel ?? 'warn',
     ssr: {
-      external: ['vue', '@vue/server-renderer'],
+      external: ['vue', 'vue/server-renderer'],
       noExternal: ['iles'],
     },
     plugins: [

diff --git a/packages/iles/src/node/build/render.ts b/packages/iles/src/node/build/render.ts
@@ -5,7 +5,7 @@ import { renderHeadToString } from '@vueuse/head'
 import type { RollupOutput } from 'rollup'
 import { renderers } from '@islands/prerender'
 import { IslandDefinition } from 'iles'
-import { renderToString } from '@vue/server-renderer'
+import { renderToString } from 'vue/server-renderer'
 import type { Awaited, AppConfig, CreateAppFactory, IslandsByPath, RouteToRender } from '../shared'
 import type { bundle } from './bundle'
 import { withSpinner } from './utils'

diff --git a/packages/iles/src/node/build/routes.ts b/packages/iles/src/node/build/routes.ts
@@ -36,8 +36,9 @@ async function resolveRoutesToRender (router: Router) {
 }
 
 async function getDynamicPaths (route: RouteRecordNormalized) {
-  const { components: { default: component }, path } = route
+  const { components, path } = route
   const file = path
+  const { default: component } = components || {}
 
   const page: PageComponent | undefined = isLazy(component)
     ? await component().then(m => 'default' in m ? m.default : m)
@@ -55,7 +56,7 @@ async function getDynamicPaths (route: RouteRecordNormalized) {
     ({ name: route.name, params, ssrProps: { ...params, ...props } }))
 }
 
-function isLazy (value: RouteRecordNormalized['components']['default']): value is () => Promise<RouteComponent> {
+function isLazy (value: NonNullable<RouteRecordNormalized['components']>['default']): value is () => Promise<RouteComponent> {
   return typeof value === 'function'
 }
 

diff --git a/packages/iles/src/node/config.ts b/packages/iles/src/node/config.ts
@@ -310,7 +310,7 @@ function viteConfigDefaults (root: string, userConfig: UserConfig): ViteOptions
         'iles',
         '@nuxt/devalue',
         '@islands/hydration',
-        '@vue/server-renderer',
+        'vue/server-renderer',
       ],
     },
   }
@@ -330,7 +330,7 @@ function mergeConfig<T = Record<string, any>> (a: T, b: T, isRoot = true): AppCo
     }
     if (isObject(existing) && isObject(value)) {
       if (isRoot && key === 'vite')
-        merged[key] = mergeViteConfig(existing, value)
+        merged[key] = mergeViteConfig(existing, value as any)
       else
         merged[key] = mergeConfig(existing, value, false)
 

diff --git a/packages/iles/src/node/plugin/parse.ts b/packages/iles/src/node/plugin/parse.ts
@@ -16,7 +16,7 @@ export function parseId (id: string) {
 export async function parseExports (code: string) {
   try {
     await initESLexer
-    return parseESModules(code)[1]
+    return parseESModules(code)[1].map(spec => spec.n)
   }
   catch (error) {
     console.error(error)

diff --git a/packages/mdx/package.json b/packages/mdx/package.json
@@ -29,7 +29,7 @@
   "homepage": "https://github.com/ElMassimo/iles",
   "bugs": "https://github.com/ElMassimo/iles/issues",
   "dependencies": {
-    "@mdx-js/mdx": "2.1.5",
+    "@mdx-js/mdx": "2.3.0",
     "estree-walker": "^3.0",
     "hash-sum": "^2.0",
     "hast-util-to-html": "^8.0.3",
@@ -47,6 +47,6 @@
     "typescript": "^4.4.4",
     "unified": "^10.1",
     "vfile": "^5.2.0",
-    "vite": "^4.0.0"
+    "vite": "^4.4.0-beta.3"
   }
 }
diff --git a/packages/pages/package.json b/packages/pages/package.json
@@ -36,14 +36,14 @@
     "pathe": "^0.2.0"
   },
   "peerDependencies": {
-    "vue": "^3.2.45"
+    "vue": "^3.3.4"
   },
   "devDependencies": {
     "@types/deep-equal": "^1.0.1",
     "@types/js-yaml": "^4.0.0",
     "tsup": "6.1.2",
     "typescript": "^4.4.4",
     "unified": "^10.1.0",
-    "vue": "^3.2.45"
+    "vue": "^3.3.4"
   }
 }
diff --git a/packages/prerender/package.json b/packages/prerender/package.json
@@ -34,13 +34,13 @@
     "@islands/hydration": "workspace:^0.8.0"
   },
   "devDependencies": {
-    "preact": "^10.11.2",
-    "preact-render-to-string": "^5.2.0",
-    "solid-js": "^1.5.7",
-    "svelte": "^3.52.0",
+    "preact": "^10.15.1",
+    "preact-render-to-string": "^6.1.0",
+    "solid-js": "^1.7.6",
+    "svelte": "^4.0.0",
     "tsup": "6.1.2",
     "typescript": "^4.4.4",
-    "vite": "^4.3.0-beta.1",
-    "vue": "^3.2.45"
+    "vite": "^4.4.0-beta.3",
+    "vue": "^3.3.4"
   }
 }
diff --git a/packages/prerender/svelte.ts b/packages/prerender/svelte.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { create_ssr_component, missing_component, validate_component } from 'svelte/internal'
 
 export default create_ssr_component(($$result: any, $$props: any) => {

diff --git a/packages/pwa/package.json b/packages/pwa/package.json
@@ -30,7 +30,7 @@
   "homepage": "https://github.com/ElMassimo/iles",
   "bugs": "https://github.com/ElMassimo/iles/issues",
   "dependencies": {
-    "vite-plugin-pwa": "^0.14.0"
+    "vite-plugin-pwa": "^0.16.4"
   },
   "devDependencies": {
     "iles": "workspace:*"

diff --git a/playground/the-vue-point/package.json b/playground/the-vue-point/package.json
@@ -23,7 +23,7 @@
     "@islands/prism": "workspace:*",
     "iles": "workspace:*",
     "remark-gfm": "^3.0.1",
-    "vite-plugin-windicss": "^1.8.8",
+    "vite-plugin-windicss": "^1.9.0",
     "vue-tsc": "^0.29.8"
   }
 }