@dev-to/react-plugin 1.1.2 → 1.1.6

package/README.md

@@ -53,7 +53,7 @@ export default defineConfig({
 - **Loader UMD**: `/__dev_to__/react/loader.js` - ReactLoader UMD 构建
 - **Component Loaders**: `/__dev_to__/react/loader/{ComponentName}.js` - 单组件加载器
 
-这些路径与事件名常量集中在 `@dev-to/react-shared`，用于保证 Vite 侧与宿主侧协议一致。
+这些路径与事件名常量集中在 `@dev-to/shared`，用于保证 Vite 侧与宿主侧协议一致。
 
 ### HMR 事件
 - Full Reload: `dev_to:react:full-reload`

package/bin/dev-to.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process'
+import fs from 'node:fs'
 import { createRequire } from 'node:module'
 import path from 'node:path'
 import process from 'node:process'
@@ -70,9 +71,30 @@ function resolveViteBin() {
   const require = createRequire(import.meta.url)
   const searchPaths = [process.cwd(), path.join(process.cwd(), 'node_modules')]
 
+  const resolved = resolvePath(require, 'vite/bin/vite.js', searchPaths)
+  if (resolved) {
+    return resolved
+  }
+
+  const viteEntry = resolvePath(require, 'vite', searchPaths)
+  if (viteEntry) {
+    const viteRoot = findPackageRoot(viteEntry)
+    if (viteRoot) {
+      const binPath = resolveBinFromPackage(viteRoot)
+      if (binPath) {
+        return binPath
+      }
+    }
+  }
+
+  console.error('Vite is not installed or could not be resolved. Please add it to devDependencies.')
+  process.exit(1)
+}
+
+function resolvePath(require, specifier, searchPaths) {
   for (const base of searchPaths) {
     try {
-      return require.resolve('vite/bin/vite.js', { paths: [base] })
+      return require.resolve(specifier, { paths: [base] })
     }
     catch {
       // Try next path.
@@ -80,14 +102,67 @@ function resolveViteBin() {
   }
 
   try {
-    return require.resolve('vite/bin/vite.js')
+    return require.resolve(specifier)
   }
   catch {
-    console.error('Vite is not installed. Please add it to devDependencies.')
-    process.exit(1)
+    return null
   }
 }
 
+function findPackageRoot(startPath) {
+  let current = path.dirname(startPath)
+  while (true) {
+    const pkgPath = path.join(current, 'package.json')
+    if (fs.existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
+        if (pkg && pkg.name === 'vite') {
+          return current
+        }
+      }
+      catch {
+        // Keep walking up.
+      }
+    }
+
+    const parent = path.dirname(current)
+    if (parent === current) {
+      break
+    }
+    current = parent
+  }
+
+  return null
+}
+
+function resolveBinFromPackage(pkgRoot) {
+  const pkgPath = path.join(pkgRoot, 'package.json')
+  if (!fs.existsSync(pkgPath)) {
+    return null
+  }
+
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
+    if (pkg && pkg.bin) {
+      const binEntry = typeof pkg.bin === 'string'
+        ? pkg.bin
+        : pkg.bin.vite || pkg.bin['vite']
+      if (binEntry) {
+        const binPath = path.resolve(pkgRoot, binEntry)
+        if (fs.existsSync(binPath)) {
+          return binPath
+        }
+      }
+    }
+  }
+  catch {
+    // Fall back to default path.
+  }
+
+  const fallback = path.resolve(pkgRoot, 'bin', 'vite.js')
+  return fs.existsSync(fallback) ? fallback : null
+}
+
 function printHelp() {
   console.log(
     [

package/dist/index.js

@@ -1,4 +1,4 @@
-import { DEV_TO_BASE_PATH, DEV_TO_DEBUG_HTML_PATH, DEV_TO_DEBUG_JSON_PATH, DEV_TO_DISCOVERY_PATH, DEV_TO_NAMESPACE, DEV_TO_REACT_BASE_PATH, DEV_TO_REACT_CONTRACT_KEY, DEV_TO_REACT_CONTRACT_PATH, DEV_TO_REACT_DEBUG_STATE_KEY, DEV_TO_REACT_DID_OPEN_BROWSER_KEY, DEV_TO_REACT_EVENT_FULL_RELOAD, DEV_TO_REACT_EVENT_HMR_UPDATE, DEV_TO_REACT_INIT_PATH, DEV_TO_REACT_LOADER_BASE_PATH, DEV_TO_REACT_LOADER_UMD_PATH, DEV_TO_REACT_NAMESPACE, DEV_TO_REACT_ORIGIN_KEY, DEV_TO_REACT_RESOLVE_ASSET_KEY, DEV_TO_REACT_RUNTIME_PATH } from "@dev-to/react-shared";
+import { DEV_TO_BASE_PATH, DEV_TO_DEBUG_HTML_PATH, DEV_TO_DEBUG_JSON_PATH, DEV_TO_DISCOVERY_PATH, DEV_TO_NAMESPACE, DEV_TO_REACT_BASE_PATH, DEV_TO_REACT_CONTRACT_KEY, DEV_TO_REACT_CONTRACT_PATH, DEV_TO_REACT_DEBUG_STATE_KEY, DEV_TO_REACT_DID_OPEN_BROWSER_KEY, DEV_TO_REACT_EVENT_FULL_RELOAD, DEV_TO_REACT_EVENT_HMR_UPDATE, DEV_TO_REACT_INIT_PATH, DEV_TO_REACT_LOADER_BASE_PATH, DEV_TO_REACT_LOADER_UMD_PATH, DEV_TO_REACT_NAMESPACE, DEV_TO_REACT_ORIGIN_KEY, DEV_TO_REACT_RESOLVE_ASSET_KEY, DEV_TO_REACT_RUNTIME_PATH } from "@dev-to/shared";
 import node_fs from "node:fs";
 import picocolors from "picocolors";
 import { mergeConfig } from "vite";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev-to/react-plugin",
-  "version": "1.1.2",
+  "version": "1.1.6",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -35,7 +35,7 @@
   "dependencies": {
     "picocolors": "^1.1.0",
     "typescript": "^5.4.5",
-    "@dev-to/react-shared": "1.0.1"
+    "@dev-to/shared": "1.0.4"
   },
   "scripts": {
     "build": "rslib build",