diff --git a/eslint.config.js b/eslint.config.js index 589548155e..cd70882c7c 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -144,7 +144,6 @@ export default [ files: ['packages/**/test/*.js', 'packages/**/*.js'], languageOptions: { globals: { - mocha: true, globalThis: false, // false means read-only }, }, diff --git a/package.json b/package.json index e1737eb473..8417847d81 100644 --- a/package.json +++ b/package.json @@ -70,22 +70,6 @@ "typescript-eslint": "^8.0.1" }, "pnpm": { - "packageExtensions": { - "vite-svg-loader": { - "peerDependenciesMeta": { - "vue": { - "optional": true - } - } - }, - "rehype-pretty-code": { - "peerDependenciesMeta": { - "shiki": { - "optional": true - } - } - } - }, "peerDependencyRules": { "ignoreMissing": [ "rollup", diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index c018c9f5e5..4934f4f338 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -68,6 +68,7 @@ "remark-rehype": "^11.1.0", "remark-shiki-twoslash": "^3.1.3", "remark-toc": "^9.0.0", + "shiki": "^1.12.1", "unified": "^11.0.5", "vite": "^5.3.5" }, diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json index 87d37bf58d..3298771c65 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json @@ -5,6 +5,7 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vite-svg-loader": "5.1.0" + "vite-svg-loader": "5.1.0", + "vue": "^3.4.35" } } \ No newline at end of file diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json index 13ebe8fae7..da24b219d6 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json @@ -8,6 +8,7 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vite-svg-loader": "5.1.0" + "vite-svg-loader": "5.1.0", + "vue": "^3.4.35" } } diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint/package.json index 51ba106cbf..dea6130e9d 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint/package.json @@ -5,6 +5,7 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vite-svg-loader": "5.1.0" + "vite-svg-loader": "5.1.0", + "vue": "^3.4.35" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d42c69146..61dc3b1bb3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,8 +4,6 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false -packageExtensionsChecksum: 43e9b7451c9943c617aef017ec172155 - importers: .: @@ -4788,6 +4786,9 @@ importers: remark-toc: specifier: ^9.0.0 version: 9.0.0 + shiki: + specifier: ^1.12.1 + version: 1.12.1 unified: specifier: ^11.0.5 version: 11.0.5 @@ -5619,6 +5620,9 @@ importers: vite-svg-loader: specifier: 5.1.0 version: 5.1.0(vue@3.4.35(typescript@5.5.4)) + vue: + specifier: ^3.4.35 + version: 3.4.35(typescript@5.5.4) packages/integrations/vue/test/fixtures/app-entrypoint-async: dependencies: @@ -5631,6 +5635,9 @@ importers: vite-svg-loader: specifier: 5.1.0 version: 5.1.0(vue@3.4.35(typescript@5.5.4)) + vue: + specifier: ^3.4.35 + version: 3.4.35(typescript@5.5.4) packages/integrations/vue/test/fixtures/app-entrypoint-css: dependencies: @@ -5652,6 +5659,9 @@ importers: vite-svg-loader: specifier: 5.1.0 version: 5.1.0(vue@3.4.35(typescript@5.5.4)) + vue: + specifier: ^3.4.35 + version: 3.4.35(typescript@5.5.4) packages/integrations/vue/test/fixtures/app-entrypoint-relative: dependencies: @@ -10439,9 +10449,6 @@ packages: engines: {node: '>=18'} peerDependencies: shiki: ^1.3.0 - peerDependenciesMeta: - shiki: - optional: true rehype-raw@7.0.0: resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==} @@ -11310,9 +11317,6 @@ packages: resolution: {integrity: sha512-M/wqwtOEjgb956/+m5ZrYT/Iq6Hax0OakWbokj8+9PXOnB7b/4AxESHieEtnNEy7ZpjsjYW1/5nK8fATQMmRxw==} peerDependencies: vue: '>=3.2.13' - peerDependenciesMeta: - vue: - optional: true vite@5.3.5: resolution: {integrity: sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==} @@ -16835,10 +16839,9 @@ snapshots: hast-util-to-string: 3.0.0 parse-numeric-range: 1.3.0 rehype-parse: 9.0.0 + shiki: 1.12.1 unified: 11.0.5 unist-util-visit: 5.0.0 - optionalDependencies: - shiki: 1.12.1 rehype-raw@7.0.0: dependencies: @@ -17876,7 +17879,6 @@ snapshots: vite-svg-loader@5.1.0(vue@3.4.35(typescript@5.5.4)): dependencies: svgo: 3.2.0 - optionalDependencies: vue: 3.4.35(typescript@5.5.4) vite@5.3.5(@types/node@18.19.31)(sass@1.77.8):