@vureact/compiler-core 1.4.0 → 1.5.0

package/lib/{chunk-NF5BSPYE.esm.js → chunk-IGLKQRRZ.esm.js}

@@ -1,5 +1,5 @@
 /**
- * @vureact/compiler-core v1.4.0
+ * @vureact/compiler-core v1.5.0
  * (c) 2025-present Ruihong Zhong (Ryan John)
  * @license MIT
  */
@@ -35,11 +35,11 @@ var PACKAGE_NAME = {
 var RUNTIME_PACKAGES = {
   router: {
     name: PACKAGE_NAME.router,
-    version: "^1.0.0"
+    version: "^2.0.1"
   },
   runtime: {
     name: PACKAGE_NAME.runtime,
-    version: "^1.0.0"
+    version: "^1.0.1"
   }
 };
 var STYLE_MODULE_NAME = "$style";
@@ -1827,12 +1827,6 @@ function resolveStyles(descriptor, ctx, result) {
       { file: filename }
     );
   }
-  if (content.includes("@import")) {
-    logger.warn(
-      "Detected @import in scoped style. Imported styles remain global. Consider inlining them to preserve scoping.",
-      { file: filename }
-    );
-  }
   const { code, fileExt } = resolveLessSass(content, {
     lang,
     filename,
@@ -1959,7 +1953,7 @@ function insertCSSImport(ctx) {
   scriptIR.imports.push(importDecl);
 }
 
-// src/core/transform/sfc/script/syntax-processor/postprocess/insert-required-imports.ts
+// src/core/transform/sfc/script/syntax-processor/postprocess/resolve-required-imports/index.ts
 import * as t18 from "@babel/types";
 
 // src/core/transform/shared.ts
@@ -1991,51 +1985,147 @@ function replaceVueSuffix(ctx, node) {
   node.extra = { rawValue: jsxFile, raw: jsxFile };
 }
 
-// src/core/transform/sfc/script/syntax-processor/postprocess/insert-required-imports.ts
-function insertRequiredImports(ctx) {
+// src/core/transform/sfc/script/syntax-processor/postprocess/resolve-required-imports/import-strategies.ts
+var VueRouterStrategy = class {
+  matches(moduleName) {
+    return moduleName === "vue-router" || moduleName.startsWith("vue-router/");
+  }
+  process() {
+    return {
+      shouldReplaceSource: true,
+      newSource: PACKAGE_NAME.router,
+      shouldRemove: false,
+      shouldInjectRuntimeImports: false
+    };
+  }
+};
+var VueEcosystemStrategy = class {
+  matches(moduleName) {
+    if (moduleName.startsWith(".") || moduleName.startsWith("/") || moduleName.startsWith("file:")) {
+      return false;
+    }
+    if (moduleName === "vue-router" || moduleName.startsWith("vue-router/")) {
+      return false;
+    }
+    if (moduleName.startsWith("@vue/")) {
+      return true;
+    }
+    for (const pkg of VUE_PACKAGES) {
+      if (moduleName === pkg || moduleName.startsWith(`${pkg}/`)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  process() {
+    return {
+      shouldReplaceSource: false,
+      shouldRemove: true,
+      shouldInjectRuntimeImports: true
+    };
+  }
+};
+var StyleFileStrategy = class {
+  regExp = /\.(less|sass|scss)$/i;
+  matches(moduleName) {
+    return this.regExp.test(moduleName);
+  }
+  process(path9, ctx) {
+    if (!ctx.preprocessStyles) {
+      return {};
+    }
+    const importSource = path9.node.source.value;
+    if (typeof importSource !== "string") {
+      return {};
+    }
+    return {
+      shouldReplaceSource: true,
+      newSource: importSource.replace(this.regExp, ".css"),
+      shouldRemove: false,
+      shouldInjectRuntimeImports: false
+    };
+  }
+};
+
+// src/core/transform/sfc/script/syntax-processor/postprocess/resolve-required-imports/import-strategy-manager.ts
+var ImportStrategyManager = class {
+  strategies = [];
+  constructor() {
+    this.strategies.push(new VueRouterStrategy());
+    this.strategies.push(new VueEcosystemStrategy());
+    this.strategies.push(new StyleFileStrategy());
+  }
+  /** 添加自定义策略 */
+  addStrategy(strategy) {
+    this.strategies.push(strategy);
+  }
+  /** 查找匹配的策略 */
+  findStrategy(moduleName) {
+    for (const strategy of this.strategies) {
+      if (strategy.matches(moduleName)) {
+        return strategy;
+      }
+    }
+    return null;
+  }
+};
+
+// src/core/transform/sfc/script/syntax-processor/postprocess/resolve-required-imports/index.ts
+function resolveRequiredImports(ctx) {
   const processedModules = /* @__PURE__ */ new Set();
   let hasProcessedImports = false;
-  recordImport(ctx, PACKAGE_NAME.react, REACT_API_MAP.memo);
+  const strategyManager = new ImportStrategyManager();
+  if (ctx.inputType === "sfc") {
+    recordImport(ctx, PACKAGE_NAME.react, REACT_API_MAP.memo);
+  }
   function resolveRequiredImport(path9) {
     const { node } = path9;
-    const moduleName = node.source.value.toLowerCase();
-    const isVueLike = isVueEcosystemPackage(moduleName);
-    mergeImports(node, ctx);
-    if (processedModules.has(moduleName) && !path9.removed) {
+    const originalModuleName = node.source.value.toLowerCase();
+    const strategy = strategyManager.findStrategy(originalModuleName);
+    if (strategy) {
+      const result = strategy.process(path9, ctx, originalModuleName);
+      if (result.shouldReplaceSource && result.newSource) {
+        node.source.value = result.newSource;
+      }
+    }
+    const normalizedModuleName = node.source.value.toLowerCase();
+    mergeImports(node, ctx, normalizedModuleName);
+    if (processedModules.has(normalizedModuleName) && !path9.removed) {
       path9.remove();
       return;
     }
-    processedModules.add(moduleName);
+    processedModules.add(normalizedModuleName);
     if (!hasProcessedImports) {
       const required = createRequiredImports(ctx);
-      if (isVueLike) {
-        path9.replaceWithMultiple(required);
-      } else if (moduleName === PACKAGE_NAME.react) {
-        path9.insertAfter(required);
+      if (strategy) {
+        const result = strategy.process(path9, ctx, originalModuleName);
+        if (result.shouldRemove) {
+          path9.replaceWithMultiple(required);
+        } else if (normalizedModuleName === PACKAGE_NAME.react) {
+          path9.insertAfter(required);
+        } else {
+          path9.insertBefore(required);
+        }
       } else {
-        path9.insertBefore(required);
+        if (normalizedModuleName === PACKAGE_NAME.react) {
+          path9.insertAfter(required);
+        } else {
+          path9.insertBefore(required);
+        }
       }
       hasProcessedImports = true;
     }
-    if (isVueLike && !path9.removed) {
-      path9.remove();
-      return;
+    if (strategy) {
+      const result = strategy.process(path9, ctx, originalModuleName);
+      if (result.shouldRemove && !path9.removed) {
+        path9.remove();
+        return;
+      }
     }
     replaceVueSuffix(ctx, node.source);
   }
-  function resolveStyleFileExt(path9) {
-    if (!ctx.preprocessStyles) return;
-    const { node } = path9;
-    if (!node || !node.source || !node.source.value) return;
-    const importSource = node.source.value;
-    if (typeof importSource !== "string") return;
-    const styleExtRegex = /\.(less|sass|scss)$/i;
-    if (!styleExtRegex.test(importSource)) return;
-    const newSource = importSource.replace(styleExtRegex, ".css");
-    node.source.value = newSource;
-  }
   return {
-    // 增加 Program.exit 兜底注入 required imports（处理无 ImportDeclaration 的 SFC）
+    // 兜底：无 ImportDeclaration 的文件也要能注入必需依赖。
     Program: {
       exit(path9) {
         if (hasProcessedImports) return;
@@ -2046,24 +2136,10 @@ function insertRequiredImports(ctx) {
     },
     ImportDeclaration(path9) {
       resolveRequiredImport(path9);
-      resolveStyleFileExt(path9);
     }
   };
 }
-function isVueEcosystemPackage(moduleName) {
-  if (moduleName.startsWith(".") || moduleName.startsWith("/") || moduleName.startsWith("file:")) {
-    return false;
-  }
-  if (moduleName.startsWith("@vue/")) {
-    return true;
-  }
-  if (moduleName === "vue-router" || moduleName.startsWith("vue-router/")) {
-    return true;
-  }
-  return VUE_PACKAGES.some((name) => moduleName === name || moduleName.startsWith(`${name}/`));
-}
-function mergeImports(currentNode, ctx) {
-  const moduleName = currentNode.source.value.toLowerCase();
+function mergeImports(currentNode, ctx, moduleName) {
   const ctxImportItems = ctx.imports.get(moduleName);
   if (!ctxImportItems?.length) {
     return;
@@ -2078,7 +2154,9 @@ function mergeImports(currentNode, ctx) {
     }
   }
   for (const item of ctxImportItems) {
-    if (currentImports.has(item.name)) return;
+    if (currentImports.has(item.name)) {
+      continue;
+    }
     const local = t18.identifier(item.name);
     const newNode = !item.onDemand ? t18.importDefaultSpecifier(local) : t18.importSpecifier(local, local);
     currentNode.specifiers.push(newNode);
@@ -3171,6 +3249,9 @@ var SLOT_DEFAULT_NAME = "default";
 var SLOT_CHILDREN_NAME = "children";
 var SLOT_FN_PARAM_NAME = "props";
 function resolveSlotsTopLevelTypes(ctx) {
+  if (ctx.inputType !== "sfc") {
+    return {};
+  }
   return {
     "TSInterfaceDeclaration|TSTypeAliasDeclaration"(path9) {
       if (!t29.isProgram(path9.parent)) return;
@@ -3736,6 +3817,9 @@ function resolveAnalysisOnlyAdapter(ctx) {
       if (!adapter || adapter.type !== "analyzed-deps") {
         return;
       }
+      if (!isVueApiReference(path9, apiName)) {
+        return;
+      }
       if (t32.isCallExpression(node)) {
         resolveCallNode(path9, adapter, ctx);
       } else {
@@ -3769,6 +3853,41 @@ function resolveCallNode(path9, adapter, ctx) {
   replaceCallName(node, adapter.target);
   recordImport(ctx, adapter.package, adapter.target);
 }
+function isVueApiReference(path9, apiName) {
+  if (path9.isIdentifier()) {
+    if (path9.parentPath.isCallExpression() && path9.parentPath.node.callee === path9.node) {
+      return false;
+    }
+    if (!path9.isReferencedIdentifier()) {
+      return false;
+    }
+  }
+  if (path9.isCallExpression()) {
+    const callee = path9.get("callee");
+    if (!callee.isIdentifier()) return false;
+    return isVueImportBinding(callee.scope.getBinding(apiName));
+  }
+  return isVueImportBinding(path9.scope.getBinding(apiName));
+}
+function isVueImportBinding(binding) {
+  if (!binding) return false;
+  const bindingPath = binding.path;
+  if (!bindingPath.isImportSpecifier() && !bindingPath.isImportDefaultSpecifier() && !bindingPath.isImportNamespaceSpecifier()) {
+    return false;
+  }
+  const parent = bindingPath.parentPath?.node;
+  if (!parent || !t32.isImportDeclaration(parent)) {
+    return false;
+  }
+  const source = parent.source.value.toLowerCase();
+  if (source.startsWith("@vue/")) {
+    return true;
+  }
+  if (source === "vue-router" || source.startsWith("vue-router/")) {
+    return true;
+  }
+  return VUE_PACKAGES.some((name) => source === name || source.startsWith(`${name}/`));
+}
 
 // src/core/transform/sfc/script/syntax-processor/process/resolve-arrow-deps.ts
 function resolveArrowFnDeps(ctx, ast) {
@@ -4049,12 +4168,18 @@ function resolveRenameAdapter(ctx) {
       } else if (isCallNode && t37.isIdentifier(node.callee)) {
         apiName = node.callee.name;
       }
+      if (!apiName) {
+        return;
+      }
       const runtimeAdapter = ADAPTER_RULES.runtime[apiName];
       const routerAdapter = ADAPTER_RULES.router[apiName];
       const adapter = runtimeAdapter || routerAdapter;
       if (!adapter || adapter.type !== "rename") {
         return;
       }
+      if (!isVueApiReference2(path9, apiName)) {
+        return;
+      }
       if (adapter.isTrackable) {
         const reactiveType = getReactiveType(apiName);
         const declaratorPath = getVariableDeclaratorPath(path9);
@@ -4075,6 +4200,41 @@ function resolveRenameAdapter(ctx) {
     }
   };
 }
+function isVueApiReference2(path9, apiName) {
+  if (path9.isIdentifier()) {
+    if (path9.parentPath.isCallExpression() && path9.parentPath.node.callee === path9.node) {
+      return false;
+    }
+    if (!path9.isReferencedIdentifier()) {
+      return false;
+    }
+  }
+  if (path9.isCallExpression()) {
+    const callee = path9.get("callee");
+    if (!callee.isIdentifier()) return false;
+    return isVueImportBinding2(callee.scope.getBinding(apiName));
+  }
+  return isVueImportBinding2(path9.scope.getBinding(apiName));
+}
+function isVueImportBinding2(binding) {
+  if (!binding) return false;
+  const bindingPath = binding.path;
+  if (!bindingPath.isImportSpecifier() && !bindingPath.isImportDefaultSpecifier() && !bindingPath.isImportNamespaceSpecifier()) {
+    return false;
+  }
+  const parent = bindingPath.parentPath?.node;
+  if (!parent || !t37.isImportDeclaration(parent)) {
+    return false;
+  }
+  const source = parent.source.value.toLowerCase();
+  if (source.startsWith("@vue/")) {
+    return true;
+  }
+  if (source === "vue-router" || source.startsWith("vue-router/")) {
+    return true;
+  }
+  return VUE_PACKAGES.some((name) => source === name || source.startsWith(`${name}/`));
+}
 
 // src/core/transform/sfc/script/syntax-processor/index.ts
 function processVueSyntax2(ast, ctx) {
@@ -4106,7 +4266,7 @@ function processVueSyntax2(ast, ctx) {
       excludeBabel: [resolveTemplateSlotIface, resolveCompIProps]
     },
     postprocess: {
-      applyBabel: [insertRequiredImports, resolveStaticHoisting],
+      applyBabel: [resolveRequiredImports, resolveStaticHoisting],
       excludeBabel: [insertCSSImport, collectLocalStatements]
     }
   });
@@ -4247,7 +4407,7 @@ function isIdentifier20(code) {
 function isStringLiteral12(code) {
   try {
     const node = parseExpression3(code);
-    return t38.isStringLiteral(node) || t38.isTemplateLiteral(node);
+    return t38.isStringLiteral(node);
   } catch {
     return false;
   }
@@ -4320,7 +4480,10 @@ function normalizePropName(rawName, name) {
     case "for":
       return "htmlFor";
     default:
-      return whitelist.test(name) ? name : camelCase(name);
+      if (!isVBind(rawName) && whitelist.test(name)) {
+        return name;
+      }
+      return camelCase(name);
   }
 }
 function isVOn(name) {
@@ -4336,7 +4499,7 @@ function isVModel(name) {
   return /^v-model/.test(name ?? "");
 }
 function isClassAttr(name) {
-  return /^(class|:class|v-bind:class|className)$/.test(name ?? "");
+  return /^(class|:class|v-bind:class|className|class-name)$/.test(name ?? "");
 }
 function isStyleAttr(name) {
   return /^(style|:style|v-bind:style)$/.test(name ?? "");
@@ -4530,7 +4693,6 @@ function resolveDefaultStyleModuleName(node) {
 
 // src/core/transform/sfc/template/syntax-processor/preprocess/resolve-style-scope-attribute.ts
 import {
-  ElementTypes,
   isSlotOutlet,
   isTemplateNode,
   NodeTypes as NodeTypes3
@@ -4554,21 +4716,30 @@ function walkElementNodes2(node, onElement) {
 }
 function injectStyleScopeAttribute(node, ctx) {
   const { scopeId } = ctx.styleData;
-  if (!scopeId || isComponentElement(node) || isSlotOutlet(node) || isTemplateNode(node)) {
+  if (!scopeId || isSlotOutlet(node) || isTemplateNode(node)) {
     return;
   }
-  const hasDynamicIs = node.props.some((prop) => {
-    if (prop.type !== NodeTypes3.DIRECTIVE || prop.arg?.type !== NodeTypes3.SIMPLE_EXPRESSION) {
-      return false;
+  let hasScopeId = false;
+  let hasClassOrId = false;
+  for (const prop of node.props) {
+    if (prop.type === NodeTypes3.ATTRIBUTE) {
+      if (prop.name === scopeId) {
+        hasScopeId = true;
+        break;
+      }
+      if (getHasClassOrId(prop.name)) {
+        hasClassOrId = true;
+        break;
+      }
+    }
+    if (prop.type === NodeTypes3.DIRECTIVE && prop.arg?.type === NodeTypes3.SIMPLE_EXPRESSION) {
+      if (getHasClassOrId(prop.arg.content)) {
+        hasClassOrId = true;
+        break;
+      }
     }
-    return prop.arg.content === "is";
-  });
-  const hasScopeId = node.props.some(
-    (prop) => prop.type === NodeTypes3.ATTRIBUTE && prop.name === scopeId
-  );
-  if (hasDynamicIs || hasScopeId) {
-    return;
   }
+  if (hasScopeId || !hasClassOrId) return;
   const attr = {
     type: NodeTypes3.ATTRIBUTE,
     name: scopeId,
@@ -4578,11 +4749,8 @@ function injectStyleScopeAttribute(node, ctx) {
   };
   node.props.push(attr);
 }
-function isComponentElement(node) {
-  if (node.tagType !== ElementTypes.COMPONENT) {
-    return camelCase(node.tag) !== node.tag;
-  }
-  return node.tagType === ElementTypes.COMPONENT;
+function getHasClassOrId(ns) {
+  return isClassAttr(ns) || ns === "id";
 }
 
 // src/core/transform/sfc/template/shared/prop-merge-utils.ts
@@ -4773,7 +4941,12 @@ function resolvePropertyIR(node, ir, ctx, nodeIR, isDynamic = false) {
     content = node.value.content = parseStyleString(content);
   }
   if (isDynamic) {
-    node.value.isStringLiteral = strCodeTypes.isStringLiteral(content);
+    const isStringLiteral13 = strCodeTypes.isStringLiteral(content);
+    if (isStringLiteral13) {
+      content = normalizeString(content);
+      node.value.content = content;
+    }
+    node.value.isStringLiteral = isStringLiteral13;
   }
   const existing = findSameProp(nodeIR.props, node);
   if (existing) {
@@ -4783,6 +4956,12 @@ function resolvePropertyIR(node, ir, ctx, nodeIR, isDynamic = false) {
   }
   resolvePropAsBabelExp(existing ?? node, ctx);
 }
+function normalizeString(s) {
+  if (s.startsWith("'") && s.endsWith("'")) {
+    return s.slice(1, -1);
+  }
+  return s;
+}
 
 // src/core/transform/sfc/template/syntax-processor/process/props/resolve-attribute-prop.ts
 function resolveAttributeProp(node, ir, ctx, nodeIR) {
@@ -4922,7 +5101,7 @@ function resolveVMemo(node, _ir, ctx, nodeIR) {
 
 // src/core/transform/sfc/template/syntax-processor/process/props/resolve-v-model.ts
 import {
-  ElementTypes as ElementTypes2,
+  ElementTypes,
   NodeTypes as NodeTypes6
 } from "@vue/compiler-core";
 function resolveVModel(node, _ir, ctx, elementNode, nodeIR) {
@@ -4930,7 +5109,7 @@ function resolveVModel(node, _ir, ctx, elementNode, nodeIR) {
   const exp = node.exp;
   const modifiers = node.modifiers.map((item) => item.content);
   const getterName = exp.content;
-  const isComponent = elementNode.tagType === ElementTypes2.COMPONENT;
+  const isComponent = elementNode.tagType === ElementTypes.COMPONENT;
   const inputType = resolveHtmlInput(elementNode, isComponent);
   const propName = arg?.content ?? resolveModelPropName(inputType, isComponent);
   let valuePropIR;
@@ -5007,7 +5186,7 @@ function resolveVOn(node, _ir, ctx, nodeIR) {
   const exp = node.exp;
   const modifiers = node.modifiers.map((item) => item.content);
   const captureIndex = modifiers.findIndex((modifier) => modifier === "capture");
-  let eventName = `on${camelCase(capitalize(arg.content))}`;
+  let eventName = normalizeVOnEventName(arg.content);
   let handler = resolveSpecialExpressions(exp.content.trim(), ctx);
   if (captureIndex > -1) {
     eventName = modifiers[captureIndex] ? `${eventName}Capture` : eventName;
@@ -5018,7 +5197,7 @@ function resolveVOn(node, _ir, ctx, nodeIR) {
     originalVueEventName = `${arg.content}.${modifiers.join(".")}`;
   } else {
     const expr = stringToExpr(handler);
-    if (!t40.isFunctionExpression(expr) && !t40.isIdentifier(expr)) {
+    if (!t40.isFunctionExpression(expr) && !t40.isArrowFunctionExpression(expr) && !t40.isIdentifier(expr)) {
       handler = `() => {${handler}}`;
     }
   }
@@ -5036,6 +5215,11 @@ function resolveVOn(node, _ir, ctx, nodeIR) {
   }
   nodeIR.props.push(eventIR);
 }
+function normalizeVOnEventName(rawEventName) {
+  const segments = rawEventName.split(/[:-]/g).map((segment) => segment.trim()).filter(Boolean);
+  const normalized = segments.map((segment) => capitalize(camelCase(segment))).join("");
+  return `on${normalized}`;
+}
 
 // src/core/transform/sfc/template/syntax-processor/process/props/resolve-v-show.ts
 function resolveVShow(node, _ir, ctx, nodeIR) {
@@ -5209,7 +5393,7 @@ function resolveCommentNode(node, _ir, ctx, childrenIR) {
 }
 
 // src/core/transform/sfc/template/syntax-processor/process/resolve-element-node.ts
-import { ElementTypes as ElementTypes3 } from "@vue/compiler-core";
+import { ElementTypes as ElementTypes2 } from "@vue/compiler-core";
 function resolveElementNode(node, ir, ctx, siblingNodesIR) {
   const isComponent = getIsComponent(node);
   const tag = isComponent ? capitalize(camelCase(node.tag)) : node.tag;
@@ -5244,10 +5428,10 @@ function createElementNodeIR(options) {
   };
 }
 function getIsComponent(node) {
-  if (node.tagType !== ElementTypes3.COMPONENT) {
+  if (node.tagType !== ElementTypes2.COMPONENT) {
     return camelCase(node.tag) !== node.tag;
   }
-  return node.tagType === ElementTypes3.COMPONENT;
+  return node.tagType === ElementTypes2.COMPONENT;
 }
 
 // src/core/transform/sfc/template/syntax-processor/process/resolve-interpolation-node.ts
@@ -5466,7 +5650,7 @@ function transform(ast, ctx, options) {
 }
 
 // package.json
-var version = "1.4.0";
+var version = "1.5.0";
 var bin = {
   vureact: "./bin/vureact.js"
 };
@@ -6874,31 +7058,31 @@ var ViteBootstrapper = class {
    * 利用 Vite 官方脚手架创建标准 React 环境
    */
   async bootstrapIfNeeded() {
-    const { bootstrapVite } = this.options.output || {};
+    const { output } = this.options;
     const workspaceDir = this.fileCompiler.getWorkspaceDir();
     await fs5.promises.mkdir(workspaceDir, { recursive: true });
-    if (bootstrapVite === false) {
+    if (output?.bootstrapVite === false) {
       return false;
     }
     if (this.isSingleFile()) {
       console.info("Skipping Vite initialization for single file compilation");
-      return false;
+      return;
     }
     const outputPkgPath = this.fileCompiler.getOutputPkgPath();
     if (fs5.existsSync(outputPkgPath)) {
-      return false;
+      return;
     }
-    this.spinner.start("Bootstrapping Vite React environment...");
     try {
+      this.spinner.start("Bootstrapping Vite React environment...");
       await this.resolveViteCreateApp();
     } catch (err) {
-      this.spinner.stop();
       console.error(
         kleur7.red("\u2716"),
-        "Failed to bootstrap Vite environment. Please check npm/network.",
+        "Failed to bootstrap Vite environment. Please check npm/network.\n",
         err
       );
-      return false;
+      this.spinner.stop();
+      return;
     }
     const removeVuePackages = (deps) => {
       for (const name in deps) {
@@ -6920,15 +7104,15 @@ var ViteBootstrapper = class {
       }
       return deps;
     };
-    const rootPkgPath = this.fileCompiler.getRootPkgPath();
-    const rootPkg = await this.fileCompiler.resolvePackageFile(rootPkgPath);
-    const vitePkg = await this.fileCompiler.resolvePackageFile(outputPkgPath);
-    const newDeps = resolveDeps(rootPkg.dependencies, vitePkg.dependencies);
-    const newDevDeps = resolveDeps(rootPkg.devDependencies, vitePkg.devDependencies, true);
-    vitePkg.dependencies = newDeps;
-    vitePkg.devDependencies = newDevDeps;
-    const newVitePkg = JSON.stringify(vitePkg, null, 2);
-    await this.fileCompiler.writeFileWithDir(outputPkgPath, newVitePkg);
+    const sourcePkgPath = this.fileCompiler.getRootPkgPath();
+    const sourcePkg = await this.fileCompiler.resolvePackageFile(sourcePkgPath);
+    let newPkg = await this.fileCompiler.resolvePackageFile(outputPkgPath);
+    const newDeps = resolveDeps(sourcePkg.dependencies, newPkg.dependencies);
+    const newDevDeps = resolveDeps(sourcePkg.devDependencies, newPkg.devDependencies, true);
+    newPkg.dependencies = newDeps;
+    newPkg.devDependencies = newDevDeps;
+    newPkg = output?.packageJson?.(newPkg) || newPkg;
+    await this.fileCompiler.writeFileWithDir(outputPkgPath, JSON.stringify(newPkg, null, 2));
     this.spinner.succeed("Standard Vite React environment initialized");
     return true;
   }
@@ -6960,15 +7144,15 @@ var ViteBootstrapper = class {
    */
   async resolveReactVersion(ver) {
     const outputPkgPath = this.fileCompiler.getOutputPkgPath();
-    const vitePkg = await this.fileCompiler.resolvePackageFile(outputPkgPath);
-    const typesVer = `^${ver.split(".")[0].replace(/@|\^/, "")}.0.0`;
-    vitePkg.dependencies.react = ver;
-    vitePkg.dependencies["react-dom"] = ver;
-    vitePkg.devDependencies["@types/react"] = typesVer;
-    vitePkg.devDependencies["@types/react-dom"] = typesVer;
-    await this.fileCompiler.writeFileWithDir(outputPkgPath, JSON.stringify(vitePkg, null, 2), {
-      lock: true
-    });
+    const curPkg = await this.fileCompiler.resolvePackageFile(outputPkgPath);
+    const mainVer = Number(ver.split(".")[0]);
+    const typeVer = !isNaN(mainVer) ? `^${mainVer.toString().replace(/@|\^|~|>=|>|/, "")}.0.0` : "^19.0.0";
+    curPkg.dependencies.react = ver;
+    curPkg.dependencies["react-dom"] = ver;
+    curPkg.devDependencies["@types/react"] = typeVer;
+    curPkg.devDependencies["@types/react-dom"] = typeVer;
+    await this.fileCompiler.writeFileWithDir(outputPkgPath, JSON.stringify(curPkg, null, 2));
+    return curPkg;
   }
 };
 
@@ -7056,7 +7240,9 @@ var FileCompiler = class extends BaseCompiler {
       await rmWorkspace();
       console.error(kleur8.red("\u2716"), `Build failed in ${endTime}`);
       console.error(error);
+      process.exit(-1);
     } finally {
+      this.spinner.stop();
       this.resetSkippedCount();
     }
   }