adtec-core-package 3.0.0 → 3.0.1

package/vite/yjsPeerResolve.ts

@@ -0,0 +1,100 @@
+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
+}
+
+function isUmoPeerImport(source: string): boolean {
+  return UMO_PEER_PREFIXES.some(
+    (prefix) => source === prefix.replace(/\/$/, '') || source.startsWith(prefix),
+  )
+}
+
+/** 宿主 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
+}
+
+export function yjsPeerResolve(): Plugin {
+  return {
+    name: 'yjs-peer-resolve',
+    enforce: 'pre',
+    config() {
+      return {
+        optimizeDeps: {
+          include: ['yjs', 'y-protocols/awareness'],
+        },
+      }
+    },
+    resolveId(source) {
+      if (!isUmoPeerImport(source)) return null
+      return resolvePeerFromCore(source)
+    },
+  }
+}

package/vite.config.ts

@@ -35,4 +35,12 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url))
     },
   },
+  css: {
+    preprocessorOptions: {
+      less: {
+        javascriptEnabled: true,
+        modifyVars: { '@prefix': 'umo' },
+      },
+    },
+  },
 })

package/vite.config.umo.ts

@@ -0,0 +1,82 @@
+import path from 'node:path'
+import { fileURLToPath, URL } from 'node:url'
+
+import vue from '@vitejs/plugin-vue'
+import vueJsx from '@vitejs/plugin-vue-jsx'
+import AutoImport from 'unplugin-auto-import/vite'
+import { defineConfig } from 'vite'
+import { coreUmoResolveConfig, coreUmoVitePlugins } from './vite/umoIntegration'
+
+const packageRoot = fileURLToPath(new URL('.', import.meta.url))
+const editorSrcRoot = path.join(packageRoot, 'src/components/editor-main/src')
+const composables = (name) => path.join(editorSrcRoot, 'composables', name)
+const umoResolve = coreUmoResolveConfig()
+
+/** prebuilt 不内联，由宿主 node_modules 提供单例（避免 Yjs 双实例） */
+const UMO_PEER_EXTERNAL = [
+  'vue',
+  'vue-i18n',
+  'yjs',
+  'y-protocols',
+  'y-prosemirror',
+  '@tiptap/y-tiptap',
+  '@tiptap/extension-collaboration',
+]
+
+function isUmoPeerExternal(id: string) {
+  return UMO_PEER_EXTERNAL.some((pkg) => id === pkg || id.startsWith(`${pkg}/`))
+}
+
+export default defineConfig({
+  plugins: [
+    ...coreUmoVitePlugins(),
+    AutoImport({
+      imports: [
+        'vue',
+        '@vueuse/core',
+        { from: composables('state.js'), imports: ['useState'] },
+        { from: composables('dialog.js'), imports: ['useAlert', 'useConfirm', 'useMessage'] },
+        { from: composables('select.js'), imports: ['useSelect'] },
+        { from: composables('copy.js'), imports: ['useCopy'] },
+        { from: composables('hotkeys.js'), imports: ['useHotkeys', 'removeAllHotkeys'] },
+        { from: composables('popup.js'), imports: ['usePopup'] },
+        { from: composables('i18n.js'), imports: ['useI18n', 'l'] },
+      ],
+      dts: false,
+    }),
+    vue(),
+    vueJsx(),
+  ],
+  resolve: {
+    ...umoResolve,
+    alias: [...umoResolve.alias],
+  },
+  css: {
+    preprocessorOptions: {
+      less: {
+        javascriptEnabled: true,
+        modifyVars: { '@prefix': 'umo' },
+      },
+    },
+  },
+  build: {
+    outDir: 'prebuilt/umo-editor',
+    emptyOutDir: true,
+    lib: {
+      entry: fileURLToPath(
+        new URL('./src/components/editor-main/umo-build-entry.js', import.meta.url),
+      ),
+      name: 'UmoEditorBundle',
+      formats: ['es'],
+      fileName: 'umo-editor',
+    },
+    rollupOptions: {
+      external: isUmoPeerExternal,
+      output: {
+        assetFileNames: 'umo-editor.[ext]',
+      },
+    },
+    sourcemap: true,
+    chunkSizeWarningLimit: 4000,
+  },
+})

package/src/components/RichTextEditor/UmoRichTextEditor.vue

@@ -1,257 +0,0 @@
-<!-- Umo Editor 封装：与 RichTextEditor 保持相同对外 API，供结题验收等模块试点 -->
-<template>
-  <el-flex ref="rootRef" class="umo-rich-text-editor-root" :style="{ height: '100%', width: '100%' }">
-    <UmoEditor
-      ref="editorRef"
-      class="umo-rich-text-editor"
-      v-bind="umoOptions"
-      @created="onEditorCreated"
-      @changed="onEditorChanged"
-      @blur="onEditorBlur"
-    />
-  </el-flex>
-</template>
-
-<script setup lang="ts">
-import { UmoEditor } from '@umoteam/editor'
-import '@umoteam/editor/style'
-import { ElMessage } from 'element-plus'
-import { computed, nextTick, onUnmounted, ref, watch } from 'vue'
-import { v4 as uuidv4 } from 'uuid'
-import { finalizeHtml, initHtml } from './richTextHtmlUtils'
-
-export type RichTextEditorConfig = {
-  placeholder?: string
-  editable?: boolean
-  [key: string]: unknown
-}
-
-const emit = defineEmits<{
-  onBlur: [payload: { html: string; text: string }]
-  onChange: [payload: { html: string; text: string }]
-}>()
-
-const props = withDefaults(
-  defineProps<{
-    showToolbar?: boolean
-    borderWidth?: string
-    editorConfig?: RichTextEditorConfig
-    isEdit?: boolean
-  }>(),
-  {
-    showToolbar: true,
-    borderWidth: '1px',
-    editorConfig: () => ({}),
-    isEdit: true,
-  },
-)
-
-const model = defineModel<string | null | undefined>({
-  required: false,
-  default: null,
-})
-const text = defineModel<string>('text', {
-  required: false,
-})
-
-const editorRef = ref<InstanceType<typeof UmoEditor> | null>(null)
-const rootRef = ref<HTMLElement | null>(null)
-const editorKey = `umo-${uuidv4()}`
-const ready = ref(false)
-const syncingContent = ref(false)
-
-const placeholderText = computed(() => {
-  const raw = props.editorConfig?.placeholder
-  if (typeof raw === 'string' && raw.trim()) return raw
-  return '请输入内容...'
-})
-
-const editable = computed(() => {
-  if (!props.isEdit) return false
-  if (props.editorConfig?.editable === false) return false
-  return true
-})
-
-const umoOptions = computed(() => ({
-  editorKey,
-  locale: 'zh-CN',
-  theme: 'light',
-  height: '100%',
-  toolbar: {
-    showSaveLabel: false,
-    defaultMode: 'classic',
-    menus: props.showToolbar ? ['base', 'insert', 'table', 'tools'] : ['base'],
-  },
-  page: {
-    layouts: ['web'],
-  },
-  document: {
-    title: '',
-    content: initHtml(model.value ?? ''),
-    placeholder: {
-      zh_CN: placeholderText.value,
-    },
-    readOnly: !editable.value,
-    enableMarkdown: false,
-    enableSpellcheck: false,
-    autoSave: {
-      enabled: false,
-    },
-  },
-  shareUrl: typeof location !== 'undefined' ? location.href : '',
-  async onFileUpload(file: File) {
-    if (file.type.startsWith('image/') && file.size > 2 * 1024 * 1024) {
-      ElMessage.warning('图片大小不能超过2M')
-      throw new Error('image too large')
-    }
-    const url = await readFileAsDataUrl(file)
-    return {
-      id: uuidv4(),
-      url,
-    }
-  },
-}))
-
-function readFileAsDataUrl(file: File) {
-  return new Promise<string>((resolve, reject) => {
-    const reader = new FileReader()
-    reader.onload = () => resolve(String(reader.result ?? ''))
-    reader.onerror = () => reject(reader.error)
-    reader.readAsDataURL(file)
-  })
-}
-
-function getEditorInstance() {
-  return editorRef.value as unknown as {
-    getHTML?: () => string
-    getText?: () => string
-    setContent?: (content: string, options?: Record<string, unknown>) => void
-    setReadOnly?: (value: boolean) => void
-    setToolbar?: (payload: { mode?: string; show?: boolean }) => void
-    setLayout?: (layout: 'page' | 'web') => void
-  } | null
-}
-
-function getRawHtml() {
-  const editor = getEditorInstance()
-  return editor?.getHTML?.() ?? ''
-}
-
-function getPlainText() {
-  const editor = getEditorInstance()
-  return editor?.getText?.() ?? ''
-}
-
-function applyEditorHtml(html: string, focus = false) {
-  const editor = getEditorInstance()
-  editor?.setContent?.(initHtml(html), {
-    emitUpdate: false,
-    focusPosition: focus ? 'end' : false,
-  })
-}
-
-function syncEditorPresentation() {
-  const editor = getEditorInstance()
-  if (!editor) return
-  editor.setLayout?.('web')
-  editor.setReadOnly?.(!editable.value)
-  editor.setToolbar?.({
-    mode: 'classic',
-    show: props.showToolbar && editable.value,
-  })
-}
-
-function publishModelFromEditor(finalize = false) {
-  const editor = getEditorInstance()
-  if (!editor) return
-  let html = getRawHtml()
-  if (finalize) {
-    html = finalizeHtml(html, rootRef.value)
-  }
-  syncingContent.value = true
-  model.value = html
-  text.value = getPlainText()
-  syncingContent.value = false
-  emit('onChange', { html, text: getPlainText() })
-}
-
-function onEditorCreated() {
-  ready.value = true
-  syncEditorPresentation()
-  applyEditorHtml(model.value ?? '', false)
-}
-
-function onEditorChanged() {
-  if (!ready.value || syncingContent.value) return
-  publishModelFromEditor(false)
-}
-
-function onEditorBlur() {
-  publishModelFromEditor(true)
-  emit('onBlur', { html: model.value ?? '', text: getPlainText() })
-}
-
-watch(
-  () => model.value,
-  (value) => {
-    if (!ready.value || syncingContent.value) return
-    const current = getRawHtml()
-    if ((value ?? '') === current) return
-    applyEditorHtml(value ?? '', false)
-  },
-)
-
-watch(
-  () => [editable.value, props.showToolbar] as const,
-  async () => {
-    if (!ready.value) return
-    await nextTick()
-    syncEditorPresentation()
-  },
-)
-
-watch(placeholderText, () => {
-  if (!ready.value) return
-  getEditorInstance()?.setContent?.(getRawHtml(), { emitUpdate: false })
-})
-
-defineExpose({
-  getHtml: () => {
-    if (!ready.value) return model.value ?? ''
-    return finalizeHtml(getRawHtml(), rootRef.value)
-  },
-  getText: () => {
-    if (!ready.value) return text.value ?? ''
-    return getPlainText()
-  },
-  setContent: (html: string, focus = false) => {
-    model.value = html
-    if (ready.value) {
-      applyEditorHtml(html, focus)
-    }
-  },
-})
-
-onUnmounted(() => {
-  ready.value = false
-})
-</script>
-
-<style scoped lang="scss">
-.umo-rich-text-editor-root {
-  min-height: 280px;
-}
-
-:deep(.umo-rich-text-editor) {
-  width: 100%;
-  height: 100%;
-  border-width: v-bind(borderWidth);
-  border-style: solid;
-  border-color: #dcdfe6;
-  box-sizing: border-box;
-}
-
-:deep(.umo-editor-container) {
-  min-height: 240px;
-}
-</style>

package/src/types/umoteam-editor.d.ts

@@ -1,8 +0,0 @@
-declare module '@umoteam/editor' {
-  import type { DefineComponent } from 'vue'
-
-  export const UmoEditor: DefineComponent<Record<string, unknown>, Record<string, unknown>, any>
-  export function useUmoEditor(options?: Record<string, unknown>): void
-}
-
-declare module '@umoteam/editor/style'