Merge branch 'main' into feat/pnpm

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           version: 7
       - run: pnpm install
-      - run: pnpm dev:prepare
+      - run: pnpm prepare
       - run: pnpm lint
       - run: pnpm build
       - run: pnpm test

README.md

@@ -33,9 +33,9 @@ Nuxt 2 is supported with Content v1, documentation is on https://content.nuxtjs.
 ## 💻 Development
 
 - Clone repository
-- Install dependencies using `pnpm install`
-- Prepare using `pnpm dev:prepare`
-- Try playground using `pnpm dev`
+- Install dependencies using `yarn install`
+- Prepare using `yarn prepare`
+- Try playground using `yarn dev`
 
 ## License
 

docs/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@docsearch/js": "^3.3.2",
-    "@nuxt-themes/docus": "^1.6.1",
+    "@nuxt-themes/docus": "^1.6.3",
     "@nuxthq/studio": "^0.6.5",
     "@nuxtlabs/github-module": "^1.6.1",
     "monaco-editor-core": "^0.34.1",

package.json

@@ -28,7 +28,7 @@
   "scripts": {
     "dev": "./scripts/playground.sh",
     "dev:build": "nuxi build playground/basic",
-    "dev:prepare": "nuxt-module-build --stub && nuxi prepare playground/basic",
+    "prepare": "nuxt-module-build --stub && nuxi prepare playground/basic",
     "dev:fixtures": "./scripts/fixture.sh",
     "build": "nuxt-module-build && pnpm build:web-types",
     "build:docs": "(cd docs && nuxi build)",
@@ -48,7 +48,6 @@
     "defu": "^6.1.2",
     "destr": "^1.2.2",
     "detab": "^3.0.2",
-    "html-tags": "^3.2.0",
     "json5": "^2.2.3",
     "knitwork": "^1.0.0",
     "listhen": "^1.0.2",
@@ -62,7 +61,7 @@
     "rehype-slug": "^5.1.0",
     "rehype-sort-attribute-values": "^4.0.0",
     "rehype-sort-attributes": "^4.0.0",
-    "remark-emoji": "^3.0.2",
+    "remark-emoji": "3.0.2",
     "remark-gfm": "^3.0.1",
     "remark-mdc": "^1.1.3",
     "remark-parse": "^10.0.1",
@@ -84,12 +83,11 @@
     "@nuxt/module-builder": "^0.2.1",
     "@nuxt/schema": "3.1.1",
     "@nuxt/test-utils": "3.1.1",
-    "@nuxthq/admin": "npm:@nuxthq/admin-edge@latest",
     "@nuxtjs/eslint-config-typescript": "latest",
     "@types/ws": "^8.5.4",
     "c8": "^7.12.0",
     "csvtojson": "^2.0.10",
-    "eslint": "^8.32.0",
+    "eslint": "^8.33.0",
     "globby": "^13.1.3",
     "husky": "^8.0.3",
     "jiti": "^1.16.2",
@@ -98,9 +96,20 @@
     "rehype-figure": "^1.0.1",
     "release-it": "^15.6.0",
     "remark-oembed": "^1.2.2",
-    "vitest": "^0.28.2",
+    "vitest": "^0.28.3",
     "vue-docgen-web-types": "^0.1.8"
   },
+  "pnpm": {
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "vue": "^3.2.45"
+      },
+      "ignoreMissing": [
+        "webpack",
+        "vue"
+      ]
+    }
+  },
   "release-it": {
     "git": {
       "commitMessage": "chore(release): release v${version}"

playground/basic/nuxt.config.ts

@@ -10,5 +10,8 @@ export default defineNuxtConfig({
         base: resolve(__dirname, 'content-fa')
       }
     }
+  },
+  typescript: {
+    includeWorkspace: true
   }
 })