adtec-core-package 3.0.1 → 3.0.2

package/vite/umoIntegration.js

@@ -23,11 +23,11 @@ function findHighlightJsRoot() {
   const projectRoot2 = getProjectRoot();
   const hoisted = path.join(projectRoot2, "node_modules/highlight.js");
   if (fs.existsSync(path.join(hoisted, "lib/core.js"))) return hoisted;
-  const pnpmDir2 = path.join(projectRoot2, "node_modules/.pnpm");
-  if (!fs.existsSync(pnpmDir2)) return null;
-  const hlDir = fs.readdirSync(pnpmDir2).find((name) => name.startsWith("highlight.js@11."));
+  const pnpmDir = path.join(projectRoot2, "node_modules/.pnpm");
+  if (!fs.existsSync(pnpmDir)) return null;
+  const hlDir = fs.readdirSync(pnpmDir).find((name) => name.startsWith("highlight.js@11."));
   if (!hlDir) return null;
-  const hlRoot = path.join(pnpmDir2, hlDir, "node_modules/highlight.js");
+  const hlRoot = path.join(pnpmDir, hlDir, "node_modules/highlight.js");
   return fs.existsSync(path.join(hlRoot, "lib/core.js")) ? hlRoot : null;
 }
 function isHighlightJsLibCore(source, importer) {
@@ -94,16 +94,65 @@ function highlightJsLibVirtual() {
 }
 
 // vite/tiptapUmoResolve.ts
+import { createRequire as createRequire2 } from "node:module";
+import fs3 from "node:fs";
+
+// vite/nodeModulesResolve.ts
 import { createRequire } from "node:module";
 import fs2 from "node:fs";
 import path2 from "node:path";
-var AIEDITOR_MARKERS = ["aieditor", "@tiptap+core@2", "@tiptap+pm@2", "@tiptap+vue-3@2"];
-var OPTIMIZE_DEPS_EXCLUDE = ["@tiptap/core", "@tiptap/pm", "@tiptap/vue-3"];
-function pnpmDir() {
-  return path2.join(getProjectRoot(), "node_modules/.pnpm");
+function preferEsmEntry(resolved) {
+  if (resolved.endsWith(".cjs")) {
+    const js = resolved.replace(/\.cjs$/, ".js");
+    const mjs = resolved.replace(/\.cjs$/, ".mjs");
+    if (fs2.existsSync(mjs)) return mjs;
+    if (fs2.existsSync(js)) return js;
+  }
+  return resolved;
 }
-function findTiptapV3Root() {
-  const dir = pnpmDir();
+function readPkgVersion(pkgJsonPath) {
+  try {
+    const pkg = JSON.parse(fs2.readFileSync(pkgJsonPath, "utf-8"));
+    return pkg.version ?? null;
+  } catch {
+    return null;
+  }
+}
+function isTiptapV3(version) {
+  return version != null && version.startsWith("3.");
+}
+function findCorePackageRoot() {
+  const root = getProjectRoot();
+  const linked = path2.join(root, "node_modules/adtec-core-package");
+  if (fs2.existsSync(path2.join(linked, "package.json"))) {
+    try {
+      return fs2.realpathSync(linked);
+    } catch {
+      return linked;
+    }
+  }
+  const sibling = path2.join(root, "../\u524D\u7AEF\u6838\u5FC3\u5305");
+  if (fs2.existsSync(path2.join(sibling, "package.json"))) {
+    return sibling;
+  }
+  const selfPkg = path2.join(root, "package.json");
+  if (fs2.existsSync(selfPkg)) {
+    try {
+      const pkg = JSON.parse(fs2.readFileSync(selfPkg, "utf-8"));
+      if (pkg.name === "adtec-core-package") return root;
+    } catch {
+    }
+  }
+  return null;
+}
+function hostNodeModules() {
+  return path2.join(getProjectRoot(), "node_modules");
+}
+function pnpmStoreDir() {
+  return path2.join(hostNodeModules(), ".pnpm");
+}
+function findTiptapV3RootFromPnpm() {
+  const dir = pnpmStoreDir();
   if (!fs2.existsSync(dir)) return null;
   const entries = fs2.readdirSync(dir);
   const coreDir = entries.find(
@@ -114,8 +163,31 @@ function findTiptapV3Root() {
   if (!fs2.existsSync(path2.join(tiptapRoot, "@tiptap/core/package.json"))) return null;
   return tiptapRoot;
 }
+function findTiptapV3RootFromHoisted(baseNodeModules) {
+  const corePkg = path2.join(baseNodeModules, "@tiptap/core/package.json");
+  if (!fs2.existsSync(corePkg) || !isTiptapV3(readPkgVersion(corePkg))) return null;
+  return baseNodeModules;
+}
+function findTiptapV3Root() {
+  const fromPnpm = findTiptapV3RootFromPnpm();
+  if (fromPnpm) return fromPnpm;
+  const fromHost = findTiptapV3RootFromHoisted(hostNodeModules());
+  if (fromHost) return fromHost;
+  const coreRoot = findCorePackageRoot();
+  if (coreRoot) {
+    const fromCore = findTiptapV3RootFromHoisted(path2.join(coreRoot, "node_modules"));
+    if (fromCore) return fromCore;
+  }
+  return null;
+}
+function findTiptapCorePkgJson() {
+  const tiptapRoot = findTiptapV3Root();
+  if (!tiptapRoot) return null;
+  const corePkg = path2.join(tiptapRoot, "@tiptap/core/package.json");
+  return fs2.existsSync(corePkg) ? corePkg : null;
+}
 function findTiptapPmPackageJson() {
-  const dir = pnpmDir();
+  const dir = pnpmStoreDir();
   const exact = path2.join(dir, "@tiptap+pm@3.20.0", "node_modules", "@tiptap/pm", "package.json");
   if (fs2.existsSync(exact)) return exact;
   if (fs2.existsSync(dir)) {
@@ -128,17 +200,10 @@ function findTiptapPmPackageJson() {
   const tiptapRoot = findTiptapV3Root();
   if (tiptapRoot) {
     const inTree = path2.join(tiptapRoot, "@tiptap/pm/package.json");
-    if (fs2.existsSync(inTree)) return inTree;
+    if (fs2.existsSync(inTree) && isTiptapV3(readPkgVersion(inTree))) return inTree;
   }
   return null;
 }
-function preferEsmEntry(resolved) {
-  if (resolved.endsWith(".cjs")) {
-    const js = resolved.replace(/\.cjs$/, ".js");
-    if (fs2.existsSync(js)) return js;
-  }
-  return resolved;
-}
 function resolveFromContext(source, contextPkgJson) {
   try {
     return preferEsmEntry(createRequire(contextPkgJson).resolve(source));
@@ -146,6 +211,35 @@ function resolveFromContext(source, contextPkgJson) {
     return null;
   }
 }
+function resolveFromHostOrCore(source) {
+  const root = getProjectRoot();
+  const hostPkg = path2.join(root, "package.json");
+  if (fs2.existsSync(hostPkg)) {
+    const resolved = resolveFromContext(source, hostPkg);
+    if (resolved) return resolved;
+  }
+  const coreRoot = findCorePackageRoot();
+  if (coreRoot) {
+    const corePkg = path2.join(coreRoot, "package.json");
+    const resolved = resolveFromContext(source, corePkg);
+    if (resolved) return resolved;
+  }
+  return null;
+}
+function buildPeerAliases(packages) {
+  const aliases = [];
+  for (const pkg of packages) {
+    const resolved = resolveFromHostOrCore(pkg);
+    if (resolved) {
+      aliases.push({ find: pkg, replacement: resolved });
+    }
+  }
+  return aliases;
+}
+
+// vite/tiptapUmoResolve.ts
+var AIEDITOR_MARKERS = ["aieditor", "@tiptap+core@2", "@tiptap+pm@2", "@tiptap+vue-3@2"];
+var OPTIMIZE_DEPS_EXCLUDE = ["@tiptap/core", "@tiptap/pm", "@tiptap/vue-3"];
 function buildVue3Aliases(requireFromV3) {
   const aliases = [];
   try {
@@ -158,7 +252,7 @@ function buildVue3Aliases(requireFromV3) {
 function buildProsemirrorAliases() {
   const pmPkgJson = findTiptapPmPackageJson();
   if (!pmPkgJson) return [];
-  const pkg = JSON.parse(fs2.readFileSync(pmPkgJson, "utf-8"));
+  const pkg = JSON.parse(fs3.readFileSync(pmPkgJson, "utf-8"));
   const aliases = [];
   for (const dep of Object.keys(pkg.dependencies ?? {})) {
     if (!dep.startsWith("prosemirror-")) continue;
@@ -170,10 +264,9 @@ function buildProsemirrorAliases() {
   return aliases;
 }
 function buildTiptapV3Aliases() {
-  const tiptapV3Root = findTiptapV3Root();
-  if (!tiptapV3Root) return buildProsemirrorAliases();
-  const requireFromV3 = createRequire(path2.join(tiptapV3Root, "@tiptap/core/package.json"));
-  void requireFromV3;
+  const corePkgJson = findTiptapCorePkgJson();
+  if (!corePkgJson) return buildProsemirrorAliases();
+  const requireFromV3 = createRequire2(corePkgJson);
   return [...buildProsemirrorAliases(), ...buildVue3Aliases(requireFromV3)];
 }
 function tiptapUmoResolve() {
@@ -190,8 +283,7 @@ function tiptapUmoResolve() {
     resolveId(source, importer) {
       if (importer && AIEDITOR_MARKERS.some((marker) => importer.includes(marker))) return null;
       if (source === "@tiptap/vue-3") return null;
-      const tiptapV3Root = findTiptapV3Root();
-      const corePkgJson = tiptapV3Root ? path2.join(tiptapV3Root, "@tiptap/core/package.json") : null;
+      const corePkgJson = findTiptapCorePkgJson();
       const pmPkgJson = findTiptapPmPackageJson();
       if (corePkgJson && source.startsWith("@tiptap/")) {
         return resolveFromContext(source, corePkgJson);
@@ -205,9 +297,9 @@ function tiptapUmoResolve() {
 }
 
 // vite/tiptapVueRendererFix.ts
-import fs3 from "node:fs";
+import fs4 from "node:fs";
 import path3 from "node:path";
-import { createRequire as createRequire2 } from "node:module";
+import { createRequire as createRequire3 } from "node:module";
 var VIRTUAL_TIPTAP_VUE3 = "\0virtual:patched-tiptap-vue-3";
 var RAW_PROP_KEYS = [
   "editor",
@@ -261,22 +353,22 @@ function patchTiptapVueRendererCode(code) {
 function findCanonicalTiptapVue3Entry() {
   const projectRoot2 = getProjectRoot();
   const hoistedPkg = path3.join(projectRoot2, "node_modules/@tiptap/vue-3/package.json");
-  if (fs3.existsSync(hoistedPkg)) {
+  if (fs4.existsSync(hoistedPkg)) {
     try {
-      const resolved = createRequire2(hoistedPkg).resolve("@tiptap/vue-3");
+      const resolved = createRequire3(hoistedPkg).resolve("@tiptap/vue-3");
       const js = resolved.endsWith(".cjs") ? resolved.replace(/\.cjs$/, ".js") : resolved;
-      return fs3.existsSync(js) ? js : resolved;
+      return fs4.existsSync(js) ? js : resolved;
     } catch {
     }
   }
-  const tiptapRoot = findTiptapV3Root();
-  if (!tiptapRoot) return null;
-  const pkgJson = path3.join(tiptapRoot, "@tiptap/vue-3/package.json");
-  if (!fs3.existsSync(pkgJson)) return null;
+  const corePkgJson = findTiptapCorePkgJson();
+  if (!corePkgJson) return null;
+  const pkgJson = path3.join(path3.dirname(path3.dirname(corePkgJson)), "@tiptap/vue-3/package.json");
+  if (!fs4.existsSync(pkgJson)) return null;
   try {
-    const resolved = createRequire2(pkgJson).resolve("@tiptap/vue-3");
+    const resolved = createRequire3(pkgJson).resolve("@tiptap/vue-3");
     const js = resolved.endsWith(".cjs") ? resolved.replace(/\.cjs$/, ".js") : resolved;
-    return fs3.existsSync(js) ? js : resolved;
+    return fs4.existsSync(js) ? js : resolved;
   } catch {
     return null;
   }
@@ -286,9 +378,9 @@ function loadPatchedTiptapVue3Code() {
   if (cachedPatchedCode) return cachedPatchedCode;
   const entry = findCanonicalTiptapVue3Entry();
   if (!entry) {
-    throw new Error("[tiptap-vue-renderer-fix] \u672A\u627E\u5230 @tiptap/vue-3@3.20\uFF0C\u8BF7\u5148 pnpm install");
+    throw new Error("[tiptap-vue-renderer-fix] \u672A\u627E\u5230 @tiptap/vue-3@3.x\uFF0C\u8BF7\u5148 npm/pnpm install");
   }
-  const patched = patchTiptapVueRendererCode(fs3.readFileSync(entry, "utf-8"));
+  const patched = patchTiptapVueRendererCode(fs4.readFileSync(entry, "utf-8"));
   if (patched.includes(REACTIVE_PROPS_BUG)) {
     throw new Error(`[tiptap-vue-renderer-fix] patch \u5931\u8D25: ${entry}`);
   }
@@ -330,15 +422,15 @@ function tiptapVueRendererFix() {
 }
 function writePatchedTiptapVue3ToDisk(targetPath) {
   const out = targetPath ?? path3.join(getProjectRoot(), "node_modules/.cache/patched-tiptap-vue-3-index.js");
-  fs3.mkdirSync(path3.dirname(out), { recursive: true });
-  fs3.writeFileSync(out, loadPatchedTiptapVue3Code(), "utf-8");
+  fs4.mkdirSync(path3.dirname(out), { recursive: true });
+  fs4.writeFileSync(out, loadPatchedTiptapVue3Code(), "utf-8");
   return out;
 }
 
 // vite/umoCjsVirtual.ts
-import fs4 from "node:fs";
+import fs5 from "node:fs";
 import path4 from "node:path";
-import { createRequire as createRequire3 } from "node:module";
+import { createRequire as createRequire4 } from "node:module";
 import { pathToFileURL } from "node:url";
 import { transformWithEsbuild as transformWithEsbuild2 } from "vite";
 var UMO_CJS_SPECS = [
@@ -357,27 +449,27 @@ var UMO_CJS_NAMED_EXPORTS = {
 };
 var VIRTUAL_UMO_CJS_PREFIX = "\0virtual:umo-cjs:";
 function requireFromProjectRoot() {
-  return createRequire3(path4.join(getProjectRoot(), "package.json"));
+  return createRequire4(path4.join(getProjectRoot(), "package.json"));
 }
 function resolvePackageMain(pkgDir) {
   const pkgJsonPath = path4.join(pkgDir, "package.json");
-  if (!fs4.existsSync(pkgJsonPath)) return null;
-  const pkgJson = JSON.parse(fs4.readFileSync(pkgJsonPath, "utf-8"));
+  if (!fs5.existsSync(pkgJsonPath)) return null;
+  const pkgJson = JSON.parse(fs5.readFileSync(pkgJsonPath, "utf-8"));
   const main = pkgJson.module || pkgJson.main || "index.js";
   const entry = path4.join(pkgDir, main);
-  return fs4.existsSync(entry) ? entry : null;
+  return fs5.existsSync(entry) ? entry : null;
 }
 function findUmoPackageDir(pkgName) {
   const projectRoot2 = getProjectRoot();
   const hoisted = path4.join(projectRoot2, "node_modules", pkgName);
-  if (fs4.existsSync(path4.join(hoisted, "package.json"))) return hoisted;
-  const pnpmDir2 = path4.join(projectRoot2, "node_modules/.pnpm");
-  if (!fs4.existsSync(pnpmDir2)) return null;
+  if (fs5.existsSync(path4.join(hoisted, "package.json"))) return hoisted;
+  const pnpmDir = path4.join(projectRoot2, "node_modules/.pnpm");
+  if (!fs5.existsSync(pnpmDir)) return null;
   const pnpmPrefix = pkgName.replace("/", "+");
-  const pkgDir = fs4.readdirSync(pnpmDir2).find((name) => name.startsWith(`${pnpmPrefix}@`));
+  const pkgDir = fs5.readdirSync(pnpmDir).find((name) => name.startsWith(`${pnpmPrefix}@`));
   if (!pkgDir) return null;
-  const resolved = path4.join(pnpmDir2, pkgDir, "node_modules", pkgName);
-  return fs4.existsSync(path4.join(resolved, "package.json")) ? resolved : null;
+  const resolved = path4.join(pnpmDir, pkgDir, "node_modules", pkgName);
+  return fs5.existsSync(path4.join(resolved, "package.json")) ? resolved : null;
 }
 function findUmoPackageEntryForSpec(spec) {
   const [pkgName, ...subParts] = spec.split("/");
@@ -393,7 +485,7 @@ function findUmoPackageEntryForSpec(spec) {
     path4.join(pkgDir, sub)
   ];
   for (const candidate of candidates) {
-    if (fs4.existsSync(candidate) && fs4.statSync(candidate).isFile()) return candidate;
+    if (fs5.existsSync(candidate) && fs5.statSync(candidate).isFile()) return candidate;
   }
   return null;
 }
@@ -429,11 +521,11 @@ async function getEsbuild() {
     return cachedEsbuild;
   } catch {
   }
-  const pnpmDir2 = path4.join(getProjectRoot(), "node_modules/.pnpm");
-  const esDir = fs4.existsSync(pnpmDir2) ? fs4.readdirSync(pnpmDir2).find((name) => name.startsWith("esbuild@")) : void 0;
+  const pnpmDir = path4.join(getProjectRoot(), "node_modules/.pnpm");
+  const esDir = fs5.existsSync(pnpmDir) ? fs5.readdirSync(pnpmDir).find((name) => name.startsWith("esbuild@")) : void 0;
   if (esDir) {
-    const esMain = path4.join(pnpmDir2, esDir, "node_modules/esbuild/lib/main.js");
-    if (fs4.existsSync(esMain)) {
+    const esMain = path4.join(pnpmDir, esDir, "node_modules/esbuild/lib/main.js");
+    if (fs5.existsSync(esMain)) {
       const mod = await import(pathToFileURL(esMain).href);
       cachedEsbuild = mod.default ?? mod;
       return cachedEsbuild;
@@ -453,7 +545,7 @@ async function bundleUmoCjsToEsm(entry) {
   });
   const code = result.outputFiles[0]?.text ?? "";
   if (code) return code;
-  const fallback = await transformWithEsbuild2(fs4.readFileSync(entry, "utf-8"), entry, {
+  const fallback = await transformWithEsbuild2(fs5.readFileSync(entry, "utf-8"), entry, {
     loader: "js",
     format: "esm",
     platform: "browser"
@@ -487,69 +579,27 @@ function umoCjsVirtual() {
 }
 
 // vite/yjsPeerResolve.ts
-import { createRequire as createRequire4 } from "node:module";
-import fs5 from "node:fs";
-import path5 from "node:path";
-var UMO_PEER_PREFIXES = ["yjs", "y-protocols", "y-prosemirror", "lib0/", "@tiptap/y-tiptap", "@tiptap/extension-collaboration"];
-function preferEsmEntry2(resolved) {
-  if (resolved.endsWith(".cjs")) {
-    const js = resolved.replace(/\.cjs$/, ".js");
-    const mjs = resolved.replace(/\.cjs$/, ".mjs");
-    if (fs5.existsSync(mjs)) return mjs;
-    if (fs5.existsSync(js)) return js;
-  }
-  return resolved;
-}
+var UMO_PEER_PREFIXES = [
+  "yjs",
+  "y-protocols",
+  "y-prosemirror",
+  "lib0/",
+  "@tiptap/y-tiptap",
+  "@tiptap/extension-collaboration"
+];
 function isUmoPeerImport(source) {
   return UMO_PEER_PREFIXES.some(
     (prefix) => source === prefix.replace(/\/$/, "") || source.startsWith(prefix)
   );
 }
-function findCorePackageRoot() {
-  const root = getProjectRoot();
-  const linked = path5.join(root, "node_modules/adtec-core-package");
-  if (fs5.existsSync(path5.join(linked, "package.json"))) {
-    try {
-      return fs5.realpathSync(linked);
-    } catch {
-      return linked;
-    }
-  }
-  const sibling = path5.join(root, "../\u524D\u7AEF\u6838\u5FC3\u5305");
-  if (fs5.existsSync(path5.join(sibling, "package.json"))) {
-    return sibling;
-  }
-  const selfPkg = path5.join(root, "package.json");
-  if (fs5.existsSync(selfPkg)) {
-    try {
-      const pkg = JSON.parse(fs5.readFileSync(selfPkg, "utf-8"));
-      if (pkg.name === "adtec-core-package") return root;
-    } catch {
-    }
-  }
-  return null;
-}
-function resolvePeerFromCore(source) {
-  const coreRoot = findCorePackageRoot();
-  if (!coreRoot) return null;
-  const pkgJson = path5.join(coreRoot, "package.json");
-  if (!fs5.existsSync(pkgJson)) return null;
-  try {
-    return preferEsmEntry2(createRequire4(pkgJson).resolve(source));
-  } catch {
-    return null;
-  }
-}
 function buildYjsPeerAliases() {
-  const roots = ["yjs", "y-protocols", "y-prosemirror", "@tiptap/y-tiptap", "@tiptap/extension-collaboration"];
-  const aliases = [];
-  for (const pkg of roots) {
-    const resolved = resolvePeerFromCore(pkg);
-    if (resolved) {
-      aliases.push({ find: pkg, replacement: resolved });
-    }
-  }
-  return aliases;
+  return buildPeerAliases([
+    "yjs",
+    "y-protocols",
+    "y-prosemirror",
+    "@tiptap/y-tiptap",
+    "@tiptap/extension-collaboration"
+  ]);
 }
 function yjsPeerResolve() {
   return {
@@ -564,7 +614,7 @@ function yjsPeerResolve() {
     },
     resolveId(source) {
       if (!isUmoPeerImport(source)) return null;
-      return resolvePeerFromCore(source);
+      return resolveFromHostOrCore(source);
     }
   };
 }

package/vite/yjsPeerResolve.ts

@@ -1,21 +1,15 @@
-import { createRequire } from 'node:module'
-import fs from 'node:fs'
-import path from 'node:path'
 import type { Alias, Plugin } from 'vite'
-import { getProjectRoot } from './projectRoot'
-
-/** prebuilt external 后，宿主须能解析 yjs 等 peer（pnpm 常未 hoist 到根 node_modules） */
-const UMO_PEER_PREFIXES = ['yjs', 'y-protocols', 'y-prosemirror', 'lib0/', '@tiptap/y-tiptap', '@tiptap/extension-collaboration']
-
-function preferEsmEntry(resolved: string): string {
-  if (resolved.endsWith('.cjs')) {
-    const js = resolved.replace(/\.cjs$/, '.js')
-    const mjs = resolved.replace(/\.cjs$/, '.mjs')
-    if (fs.existsSync(mjs)) return mjs
-    if (fs.existsSync(js)) return js
-  }
-  return resolved
-}
+import { buildPeerAliases, resolveFromHostOrCore } from './nodeModulesResolve'
+
+/** prebuilt external 后，宿主须能解析 yjs 等 peer（npm / pnpm 均可能未 hoist 到根 node_modules） */
+const UMO_PEER_PREFIXES = [
+  'yjs',
+  'y-protocols',
+  'y-prosemirror',
+  'lib0/',
+  '@tiptap/y-tiptap',
+  '@tiptap/extension-collaboration',
+]
 
 function isUmoPeerImport(source: string): boolean {
   return UMO_PEER_PREFIXES.some(
@@ -23,62 +17,14 @@ function isUmoPeerImport(source: string): boolean {
   )
 }
 
-/** 宿主 node_modules/adtec-core-package（pnpm file: 链接真实路径） */
-export function findCorePackageRoot(): string | null {
-  const root = getProjectRoot()
-  const linked = path.join(root, 'node_modules/adtec-core-package')
-  if (fs.existsSync(path.join(linked, 'package.json'))) {
-    try {
-      return fs.realpathSync(linked)
-    } catch {
-      return linked
-    }
-  }
-
-  const sibling = path.join(root, '../前端核心包')
-  if (fs.existsSync(path.join(sibling, 'package.json'))) {
-    return sibling
-  }
-
-  const selfPkg = path.join(root, 'package.json')
-  if (fs.existsSync(selfPkg)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(selfPkg, 'utf-8')) as { name?: string }
-      if (pkg.name === 'adtec-core-package') return root
-    } catch {
-      // ignore
-    }
-  }
-
-  return null
-}
-
-function resolvePeerFromCore(source: string): string | null {
-  const coreRoot = findCorePackageRoot()
-  if (!coreRoot) return null
-
-  const pkgJson = path.join(coreRoot, 'package.json')
-  if (!fs.existsSync(pkgJson)) return null
-
-  try {
-    return preferEsmEntry(createRequire(pkgJson).resolve(source))
-  } catch {
-    return null
-  }
-}
-
 export function buildYjsPeerAliases(): Alias[] {
-  const roots = ['yjs', 'y-protocols', 'y-prosemirror', '@tiptap/y-tiptap', '@tiptap/extension-collaboration']
-  const aliases: Alias[] = []
-
-  for (const pkg of roots) {
-    const resolved = resolvePeerFromCore(pkg)
-    if (resolved) {
-      aliases.push({ find: pkg, replacement: resolved })
-    }
-  }
-
-  return aliases
+  return buildPeerAliases([
+    'yjs',
+    'y-protocols',
+    'y-prosemirror',
+    '@tiptap/y-tiptap',
+    '@tiptap/extension-collaboration',
+  ])
 }
 
 export function yjsPeerResolve(): Plugin {
@@ -94,7 +40,7 @@ export function yjsPeerResolve(): Plugin {
     },
     resolveId(source) {
       if (!isUmoPeerImport(source)) return null
-      return resolvePeerFromCore(source)
+      return resolveFromHostOrCore(source)
     },
   }
 }

package/vite.config.umo.ts

@@ -20,7 +20,6 @@ const UMO_PEER_EXTERNAL = [
   'y-protocols',
   'y-prosemirror',
   '@tiptap/y-tiptap',
-  '@tiptap/extension-collaboration',
 ]
 
 function isUmoPeerExternal(id: string) {