@astrojs/markdown-remark 1.1.2 → 1.1.3

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@astrojs/markdown-remark:build: cache hit, replaying output a3732d3a3024eee3
+@astrojs/markdown-remark:build: cache hit, replaying output 724460aa5e72591a
 @astrojs/markdown-remark:build: 
-@astrojs/markdown-remark:build: > @astrojs/markdown-remark@1.1.2 build /home/runner/work/astro/astro/packages/markdown/remark
+@astrojs/markdown-remark:build: > @astrojs/markdown-remark@1.1.3 build /home/runner/work/astro/astro/packages/markdown/remark
 @astrojs/markdown-remark:build: > astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json
 @astrojs/markdown-remark:build: 

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @astrojs/markdown-remark
 
+## 1.1.3
+
+### Patch Changes
+
+- [#4842](https://github.com/withastro/astro/pull/4842) [`812658ad2`](https://github.com/withastro/astro/commit/812658ad2ab3732a99e35c4fd903e302e723db46) Thanks [@bluwy](https://github.com/bluwy)! - Fix non-hoisted remark/rehype plugin loading
+
+- [#4842](https://github.com/withastro/astro/pull/4842) [`812658ad2`](https://github.com/withastro/astro/commit/812658ad2ab3732a99e35c4fd903e302e723db46) Thanks [@bluwy](https://github.com/bluwy)! - Add missing dependencies, support strict dependency installation (e.g. pnpm)
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/load-plugins.js

@@ -1,6 +1,16 @@
+import { resolve as importMetaResolve } from "import-meta-resolve";
+import path from "path";
+import { pathToFileURL } from "url";
+const cwdUrlStr = pathToFileURL(path.join(process.cwd(), "package.json")).toString();
 async function importPlugin(p) {
   if (typeof p === "string") {
-    const importResult = await import(p);
+    try {
+      const importResult2 = await import(p);
+      return importResult2.default;
+    } catch {
+    }
+    const resolved = await importMetaResolve(p, cwdUrlStr);
+    const importResult = await import(resolved);
     return importResult.default;
   }
   return p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/markdown-remark",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -22,6 +22,8 @@
     "acorn-jsx": "^5.3.2",
     "github-slugger": "^1.4.0",
     "hast-util-to-html": "^8.0.3",
+    "import-meta-resolve": "^2.1.0",
+    "mdast-util-from-markdown": "^1.2.0",
     "mdast-util-mdx-expression": "^1.2.1",
     "mdast-util-mdx-jsx": "^1.2.0",
     "micromark-extension-mdx-expression": "^1.0.3",
@@ -46,7 +48,7 @@
     "@types/mdast": "^3.0.10",
     "@types/mocha": "^9.1.1",
     "@types/unist": "^2.0.6",
-    "astro-scripts": "0.0.7",
+    "astro-scripts": "0.0.8",
     "chai": "^4.3.6",
     "micromark-util-types": "^1.0.2",
     "mocha": "^9.2.2"

package/src/load-plugins.ts

@@ -1,8 +1,21 @@
+import { resolve as importMetaResolve } from 'import-meta-resolve';
+import path from 'path';
 import * as unified from 'unified';
+import { pathToFileURL } from 'url';
+
+const cwdUrlStr = pathToFileURL(path.join(process.cwd(), 'package.json')).toString();
 
 async function importPlugin(p: string | unified.Plugin): Promise<unified.Plugin> {
 	if (typeof p === 'string') {
-		const importResult = await import(p);
+		// Try import from this package first
+		try {
+			const importResult = await import(p);
+			return importResult.default;
+		} catch {}
+
+		// Try import from user project
+		const resolved = await importMetaResolve(p, cwdUrlStr);
+		const importResult = await import(resolved);
 		return importResult.default;
 	}