Simplify eslint and pnpm config (#11646)

withastro · Aug 8, 2024 · cc405dd · cc405dd
1 parent 13b912a
commit cc405dd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"
   }
 }
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
@@ -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
@@ -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"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml