adtec-core-package 3.0.1 → 3.0.2

package/vite/nodeModulesResolve.ts

@@ -0,0 +1,175 @@
+import { createRequire } from 'node:module'
+import fs from 'node:fs'
+import path from 'node:path'
+import type { Alias } from 'vite'
+import { getProjectRoot } from './projectRoot'
+
+export 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
+}
+
+export function readPkgVersion(pkgJsonPath: string): string | null {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8')) as { version?: string }
+    return pkg.version ?? null
+  } catch {
+    return null
+  }
+}
+
+function isTiptapV3(version: string | null): boolean {
+  return version != null && version.startsWith('3.')
+}
+
+/** 宿主 node_modules/adtec-core-package（npm / 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 hostNodeModules(): string {
+  return path.join(getProjectRoot(), 'node_modules')
+}
+
+function pnpmStoreDir(): string {
+  return path.join(hostNodeModules(), '.pnpm')
+}
+
+function findTiptapV3RootFromPnpm(): string | null {
+  const dir = pnpmStoreDir()
+  if (!fs.existsSync(dir)) return null
+
+  const entries = fs.readdirSync(dir)
+  const coreDir =
+    entries.find(
+      (name) => name.startsWith('@tiptap+core@3.20') && name.includes('@tiptap+pm@3.20'),
+    ) ?? entries.find((name) => name.startsWith('@tiptap+core@3.') && name.includes('@tiptap+pm@3.'))
+  if (!coreDir) return null
+
+  const tiptapRoot = path.join(dir, coreDir, 'node_modules')
+  if (!fs.existsSync(path.join(tiptapRoot, '@tiptap/core/package.json'))) return null
+  return tiptapRoot
+}
+
+function findTiptapV3RootFromHoisted(baseNodeModules: string): string | null {
+  const corePkg = path.join(baseNodeModules, '@tiptap/core/package.json')
+  if (!fs.existsSync(corePkg) || !isTiptapV3(readPkgVersion(corePkg))) return null
+  return baseNodeModules
+}
+
+/** TipTap 3.x 依赖树根（兼容 pnpm store 与 npm 扁平 node_modules） */
+export function findTiptapV3Root(): string | null {
+  const fromPnpm = findTiptapV3RootFromPnpm()
+  if (fromPnpm) return fromPnpm
+
+  const fromHost = findTiptapV3RootFromHoisted(hostNodeModules())
+  if (fromHost) return fromHost
+
+  const coreRoot = findCorePackageRoot()
+  if (coreRoot) {
+    const fromCore = findTiptapV3RootFromHoisted(path.join(coreRoot, 'node_modules'))
+    if (fromCore) return fromCore
+  }
+
+  return null
+}
+
+export function findTiptapCorePkgJson(): string | null {
+  const tiptapRoot = findTiptapV3Root()
+  if (!tiptapRoot) return null
+
+  const corePkg = path.join(tiptapRoot, '@tiptap/core/package.json')
+  return fs.existsSync(corePkg) ? corePkg : null
+}
+
+export function findTiptapPmPackageJson(): string | null {
+  const dir = pnpmStoreDir()
+  const exact = path.join(dir, '@tiptap+pm@3.20.0', 'node_modules', '@tiptap/pm', 'package.json')
+  if (fs.existsSync(exact)) return exact
+
+  if (fs.existsSync(dir)) {
+    const pmDir = fs
+      .readdirSync(dir)
+      .find((name) => name.startsWith('@tiptap+pm@3.20') || name.startsWith('@tiptap+pm@3.'))
+    if (pmDir) {
+      const candidate = path.join(dir, pmDir, 'node_modules', '@tiptap/pm', 'package.json')
+      if (fs.existsSync(candidate)) return candidate
+    }
+  }
+
+  const tiptapRoot = findTiptapV3Root()
+  if (tiptapRoot) {
+    const inTree = path.join(tiptapRoot, '@tiptap/pm/package.json')
+    if (fs.existsSync(inTree) && isTiptapV3(readPkgVersion(inTree))) return inTree
+  }
+
+  return null
+}
+
+export function resolveFromContext(source: string, contextPkgJson: string): string | null {
+  try {
+    return preferEsmEntry(createRequire(contextPkgJson).resolve(source))
+  } catch {
+    return null
+  }
+}
+
+/** 从宿主或核心包解析模块（npm / pnpm 通用） */
+export function resolveFromHostOrCore(source: string): string | null {
+  const root = getProjectRoot()
+  const hostPkg = path.join(root, 'package.json')
+  if (fs.existsSync(hostPkg)) {
+    const resolved = resolveFromContext(source, hostPkg)
+    if (resolved) return resolved
+  }
+
+  const coreRoot = findCorePackageRoot()
+  if (coreRoot) {
+    const corePkg = path.join(coreRoot, 'package.json')
+    const resolved = resolveFromContext(source, corePkg)
+    if (resolved) return resolved
+  }
+
+  return null
+}
+
+export function buildPeerAliases(packages: string[]): Alias[] {
+  const aliases: Alias[] = []
+  for (const pkg of packages) {
+    const resolved = resolveFromHostOrCore(pkg)
+    if (resolved) {
+      aliases.push({ find: pkg, replacement: resolved })
+    }
+  }
+  return aliases
+}

package/vite/tiptapUmoResolve.ts

@@ -2,73 +2,20 @@ 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'
+import {
+  findTiptapCorePkgJson,
+  findTiptapPmPackageJson,
+  findTiptapV3Root,
+  preferEsmEntry,
+  resolveFromContext,
+} from './nodeModulesResolve'
+
+export { findTiptapV3Root } from './nodeModulesResolve'
 
 const AIEDITOR_MARKERS = ['aieditor', '@tiptap+core@2', '@tiptap+pm@2', '@tiptap+vue-3@2']
 
 const OPTIMIZE_DEPS_EXCLUDE = ['@tiptap/core', '@tiptap/pm', '@tiptap/vue-3']
 
-function pnpmDir(): string {
-  return path.join(getProjectRoot(), 'node_modules/.pnpm')
-}
-
-/** 优先使用宿主 node_modules 中的 TipTap 3.20 依赖树 */
-export function findTiptapV3Root(): string | null {
-  const dir = pnpmDir()
-  if (!fs.existsSync(dir)) return null
-
-  const entries = fs.readdirSync(dir)
-  const coreDir =
-    entries.find(
-      (name) => name.startsWith('@tiptap+core@3.20') && name.includes('@tiptap+pm@3.20'),
-    ) ?? entries.find((name) => name.startsWith('@tiptap+core@3.') && name.includes('@tiptap+pm@3.'))
-  if (!coreDir) return null
-
-  const tiptapRoot = path.join(dir, coreDir, 'node_modules')
-  if (!fs.existsSync(path.join(tiptapRoot, '@tiptap/core/package.json'))) return null
-  return tiptapRoot
-}
-
-function findTiptapPmPackageJson(): string | null {
-  const dir = pnpmDir()
-  const exact = path.join(dir, '@tiptap+pm@3.20.0', 'node_modules', '@tiptap/pm', 'package.json')
-  if (fs.existsSync(exact)) return exact
-
-  if (fs.existsSync(dir)) {
-    const pmDir = fs
-      .readdirSync(dir)
-      .find((name) => name.startsWith('@tiptap+pm@3.20') || name.startsWith('@tiptap+pm@3.'))
-    if (pmDir) {
-      const candidate = path.join(dir, pmDir, 'node_modules', '@tiptap/pm', 'package.json')
-      if (fs.existsSync(candidate)) return candidate
-    }
-  }
-
-  const tiptapRoot = findTiptapV3Root()
-  if (tiptapRoot) {
-    const inTree = path.join(tiptapRoot, '@tiptap/pm/package.json')
-    if (fs.existsSync(inTree)) return inTree
-  }
-
-  return null
-}
-
-function preferEsmEntry(resolved: string): string {
-  if (resolved.endsWith('.cjs')) {
-    const js = resolved.replace(/\.cjs$/, '.js')
-    if (fs.existsSync(js)) return js
-  }
-  return resolved
-}
-
-function resolveFromContext(source: string, contextPkgJson: string): string | null {
-  try {
-    return preferEsmEntry(createRequire(contextPkgJson).resolve(source))
-  } catch {
-    return null
-  }
-}
-
 function buildVue3Aliases(requireFromV3: NodeRequire): Alias[] {
   const aliases: Alias[] = []
   try {
@@ -99,11 +46,10 @@ function buildProsemirrorAliases(): Alias[] {
 }
 
 export function buildTiptapV3Aliases(): Alias[] {
-  const tiptapV3Root = findTiptapV3Root()
-  if (!tiptapV3Root) return buildProsemirrorAliases()
+  const corePkgJson = findTiptapCorePkgJson()
+  if (!corePkgJson) return buildProsemirrorAliases()
 
-  const requireFromV3 = createRequire(path.join(tiptapV3Root, '@tiptap/core/package.json'))
-  void requireFromV3
+  const requireFromV3 = createRequire(corePkgJson)
   return [...buildProsemirrorAliases(), ...buildVue3Aliases(requireFromV3)]
 }
 
@@ -122,8 +68,7 @@ export function tiptapUmoResolve(): Plugin {
       if (importer && AIEDITOR_MARKERS.some((marker) => importer.includes(marker))) return null
       if (source === '@tiptap/vue-3') return null
 
-      const tiptapV3Root = findTiptapV3Root()
-      const corePkgJson = tiptapV3Root ? path.join(tiptapV3Root, '@tiptap/core/package.json') : null
+      const corePkgJson = findTiptapCorePkgJson()
       const pmPkgJson = findTiptapPmPackageJson()
 
       if (corePkgJson && source.startsWith('@tiptap/')) {

package/vite/tiptapVueRendererFix.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import { createRequire } from 'node:module'
 import type { Plugin } from 'vite'
-import { findTiptapV3Root } from './tiptapUmoResolve'
+import { findTiptapCorePkgJson } from './nodeModulesResolve'
 import { getProjectRoot } from './projectRoot'
 
 const VIRTUAL_TIPTAP_VUE3 = '\0virtual:patched-tiptap-vue-3'
@@ -92,10 +92,10 @@ function findCanonicalTiptapVue3Entry(): string | null {
     }
   }
 
-  const tiptapRoot = findTiptapV3Root()
-  if (!tiptapRoot) return null
+  const corePkgJson = findTiptapCorePkgJson()
+  if (!corePkgJson) return null
 
-  const pkgJson = path.join(tiptapRoot, '@tiptap/vue-3/package.json')
+  const pkgJson = path.join(path.dirname(path.dirname(corePkgJson)), '@tiptap/vue-3/package.json')
   if (!fs.existsSync(pkgJson)) return null
 
   try {
@@ -114,7 +114,7 @@ function loadPatchedTiptapVue3Code(): string {
 
   const entry = findCanonicalTiptapVue3Entry()
   if (!entry) {
-    throw new Error('[tiptap-vue-renderer-fix] 未找到 @tiptap/vue-3@3.20，请先 pnpm install')
+    throw new Error('[tiptap-vue-renderer-fix] 未找到 @tiptap/vue-3@3.x，请先 npm/pnpm install')
   }
 
   const patched = patchTiptapVueRendererCode(fs.readFileSync(entry, 'utf-8'))