chore: upgrade nuxt version (#1888)

unocss · Nov 17, 2022 · 2faa911 · 2faa911
1 parent 9710504
commit 2faa911
Show file tree

Hide file tree

Showing 9 changed files with 1,954 additions and 495 deletions.
diff --git a/examples/nuxt3/nuxt.config.ts b/examples/nuxt3/nuxt.config.ts
@@ -1,5 +1,3 @@
-import { defineNuxtConfig } from 'nuxt'
-
 export default defineNuxtConfig({
   modules: [
     '@unocss/nuxt',

diff --git a/examples/nuxt3/package.json b/examples/nuxt3/package.json
@@ -1,16 +1,17 @@
 {
   "private": true,
   "scripts": {
+    "postinstall": "nuxi prepare",
     "build": "nuxi build",
     "dev": "nuxi dev",
-    "start": "node .output/server/index.mjs"
+    "preview": "nuxi preview"
   },
   "devDependencies": {
     "@iconify-json/carbon": "^1.1.9",
     "@unocss/core": "link:../../packages/core",
     "@unocss/nuxt": "link:../../packages/nuxt",
     "@unocss/reset": "link:../../packages/reset",
-    "nuxt": "^3.0.0-rc.11",
+    "nuxt": "^3.0.0",
     "unocss": "link:../../packages/unocss"
   }
 }
diff --git a/interactive/nuxt.config.ts b/interactive/nuxt.config.ts
@@ -1,5 +1,3 @@
-import { defineNuxtConfig } from 'nuxt'
-
 import { alias } from '../alias'
 
 const externals = [

diff --git a/interactive/package.json b/interactive/package.json
@@ -3,9 +3,9 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "build": "nuxi prepare && esno scripts/prepare.ts && nuxi generate .",
-    "dev": "nuxi prepare && esno scripts/prepare.ts && nuxi dev .",
-    "start": "node .output/server/index.mjs",
+    "build": "nuxi prepare && esno scripts/prepare.ts && nuxi generate",
+    "dev": "nuxi prepare && esno scripts/prepare.ts && nuxi dev",
+    "preview": "nuxi preview",
     "fetch": "esno scripts/fetch.ts"
   },
   "devDependencies": {
@@ -20,7 +20,7 @@
     "js-yaml": "^4.1.0",
     "knitwork": "^0.1.2",
     "markdown-it-link-attributes": "^4.0.1",
-    "nuxt": "3.0.0-rc.11",
+    "nuxt": "^3.0.0",
     "p-limit": "^4.0.0",
     "postcss-nested": "^6.0.0",
     "prettier": "^2.7.1",

diff --git a/interactive/unocss.config.ts b/interactive/unocss.config.ts
@@ -17,10 +17,10 @@ export const defaultConfig = defineConfig<{}>({
   ],
 })
 
-export default defineConfig<{}>({
+export default defineConfig({
   ...defaultConfig,
   presets: [
-    ...defaultConfig.presets as any,
+    ...defaultConfig.presets!,
     presetIcons({
       scale: 1.2,
     }),

diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "lz-string": "^1.4.4",
     "magic-string": "^0.26.7",
     "msw": "^0.47.4",
-    "nuxt": "3.0.0-rc.11",
+    "nuxt": "^3.0.0",
     "nuxt-tsconfig-stub": "^0.0.2",
     "pnpm": "7.13.5",
     "prettier": "^2.7.1",
@@ -113,7 +113,7 @@
     "overrides": {
       "@nuxt/kit-edge": "npm:@nuxt/kit@latest",
       "vite": "^3.1.6",
-      "nuxt": "3.0.0-rc.11"
+      "nuxt": "^3.0.0"
     }
   },
   "simple-git-hooks": {

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -41,7 +41,7 @@
     "stub": "unbuild --stub"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.11",
+    "@nuxt/kit": "^3.0.0",
     "@unocss/core": "workspace:*",
     "@unocss/preset-attributify": "workspace:*",
     "@unocss/preset-icons": "workspace:*",
@@ -56,6 +56,6 @@
     "unocss": "workspace:*"
   },
   "devDependencies": {
-    "@nuxt/schema": "^3.0.0-rc.11"
+    "@nuxt/schema": "^3.0.0"
   }
 }
diff --git a/packages/nuxt/src/index.ts b/packages/nuxt/src/index.ts
@@ -63,7 +63,7 @@ export default defineNuxtModule<UnocssNuxtOptions>({
 
     // Nuxt 2
     if (isNuxt2()) {
-      nuxt.hook('config', (config) => {
+      nuxt.hook('app:resolve', (config) => {
         const plugin: NuxtPlugin = { src: 'unocss.mjs', mode: 'client' }
         if (config.plugins)
           config.plugins.push(plugin)