Merge pull request #1150 from ymmooot/issue-1149

fix #1149
ymmooot · Apr 13, 2023 · c685ef1 · c685ef1
2 parents ece3897 + e708387
commit c685ef1
Show file tree

Hide file tree

Showing 10 changed files with 3,282 additions and 2,094 deletions.
diff --git a/packages/example/nuxt.config.ts b/packages/example/nuxt.config.ts
@@ -3,4 +3,5 @@ import NuxtJsonld from 'nuxt-jsonld';
 export default defineNuxtConfig({
   modules: [NuxtJsonld],
   css: ['@/css/index.css'],
+  devtools: true,
 });
diff --git a/packages/example/package.json b/packages/example/package.json
@@ -4,8 +4,14 @@
   "version": "0.0.1",
   "scripts": {
     "prepare": "yarn workspace nuxt-jsonld build",
-    "dev": "yarn prepare && nuxi dev",
+    "dev": "nuxi dev",
     "build": "yarn prepare && nuxi build",
     "start": "node ./.output/server/index.mjs"
+  },
+  "dependencies": {
+    "nuxt": "^3.4.1"
+  },
+  "devDependencies": {
+    "@nuxt/devtools": "^0.4.0"
   }
 }
diff --git a/packages/nuxt-jsonld/package.json b/packages/nuxt-jsonld/package.json
@@ -37,7 +37,7 @@
     "esbuild": "^0.17.14",
     "esbuild-jest": "^0.5.0",
     "jest": "^29.5.0",
-    "nuxt": "^3.0.0",
+    "nuxt": "^3.4.1",
     "prettier": "^2.8.7",
     "shipjs": "0.26.1",
     "tsup": "^6.7.0",

diff --git a/packages/nuxt-jsonld/src/runtime/composable.ts b/packages/nuxt-jsonld/src/runtime/composable.ts
@@ -1,6 +1,6 @@
 import { computed } from 'vue';
 import type { JsonLD, JsonLDFunc } from '../types';
-import { useHead } from '#head';
+import { useHead } from '@unhead/vue';
 
 const isFunc = (json: JsonLD | JsonLDFunc): json is JsonLDFunc => typeof json === 'function';
 

diff --git a/packages/nuxt-jsonld/src/runtime/plugin-impl.ts b/packages/nuxt-jsonld/src/runtime/plugin-impl.ts
@@ -1,5 +1,5 @@
 import { computed } from 'vue';
-import { useHead } from '#head';
+import { useHead } from '@unhead/vue';
 
 export default (nuxtApp) => {
   const mixin = {

diff --git a/packages/nuxt-jsonld/src/runtime/plugin.ts b/packages/nuxt-jsonld/src/runtime/plugin.ts
@@ -1,4 +1,4 @@
-import { defineNuxtPlugin } from '#app';
+import { defineNuxtPlugin } from 'nuxt/app';
 import plugin from './plugin-impl';
 
 export default defineNuxtPlugin(plugin);
diff --git a/packages/nuxt-jsonld/test/composable.spec.js b/packages/nuxt-jsonld/test/composable.spec.js
@@ -1,9 +1,9 @@
 import { useJsonld } from '../src/runtime/composable';
 import { ref } from 'vue';
-import { useHead } from '#head';
+import { useHead } from '@unhead/vue';
 
 let useHeadArg = undefined;
-jest.mock('#head', () => ({
+jest.mock('@unhead/vue', () => ({
   useHead: jest.fn().mockImplementation((arg) => {
     useHeadArg = arg;
   }),

diff --git a/packages/nuxt-jsonld/test/plugin.spec.js b/packages/nuxt-jsonld/test/plugin.spec.js
@@ -1,7 +1,7 @@
 import plugin from '../src/runtime/plugin-impl';
 
 let useHeadArg = undefined;
-jest.mock('#head', () => ({
+jest.mock('@unhead/vue', () => ({
   useHead: jest.fn().mockImplementation((arg) => {
     useHeadArg = arg;
   }),

diff --git a/packages/nuxt-jsonld/tsconfig.json b/packages/nuxt-jsonld/tsconfig.json
@@ -10,10 +10,6 @@
     "sourceMap": false,
     "declaration": true,
     "lib": ["ESNext"],
-    "paths": {
-      "#app": ["../../node_modules/nuxt/dist/app"],
-      "#head": ["../../node_modules/nuxt/dist/head/runtime"]
-    },
     "types": ["@nuxt/schema"]
   },
   "include": ["./src/**/*"]

diff --git a/yarn.lock b/yarn.lock