@umijs/preset-vue 4.0.0-canary.20220729.2 → 4.0.0-canary.20220819.1

package/dist/features/default.js

@@ -48,18 +48,18 @@ var default_default = (api) => {
   api.describe({
     key: "preset-vue:default"
   });
-  const vuePath = (0, import_resolveProjectDep.resolveProjectDep)({
-    pkg: api.pkg,
-    cwd: api.cwd,
-    dep: "vue/dist/vue.esm-bundler.js"
-  }) || require.resolve("vue/dist/vue.esm-bundler.js");
-  const vueRuntimePath = (0, import_resolveProjectDep.resolveProjectDep)({
-    pkg: api.pkg,
-    cwd: api.cwd,
-    dep: "vue/dist/vue.runtime.esm-bundler.js"
-  }) || require.resolve("vue/dist/vue.runtime.esm-bundler.js");
   api.modifyDefaultConfig((config) => {
     var _a;
+    const vuePath = (0, import_resolveProjectDep.resolveVuePath)({
+      pkg: api.pkg,
+      cwd: api.cwd,
+      path: "dist/vue.esm-bundler.js"
+    });
+    const vueRuntimePath = (0, import_resolveProjectDep.resolveVuePath)({
+      pkg: api.pkg,
+      cwd: api.cwd,
+      path: "dist/vue.runtime.esm-bundler.js"
+    });
     config.alias = __spreadProps(__spreadValues({}, config.alias), {
       vue: ((_a = api.userConfig.vue) == null ? void 0 : _a.runtimeCompiler) ? vuePath : vueRuntimePath,
       "vue-router": (0, import_resolveProjectDep.resolveProjectDep)({

package/dist/requireHook.js

@@ -32,8 +32,7 @@ var hookPropertyMap = /* @__PURE__ */ new Map([
   ["webpack/package.json", "@umijs/bundler-webpack/compiled/webpack/package"],
   ["webpack/lib/webpack", "@umijs/bundler-webpack/compiled/webpack"],
   ["webpack/lib/webpack.js", "@umijs/bundler-webpack/compiled/webpack"],
-  ["tapable", "@umijs/bundler-utils/compiled/tapable"],
-  ["vite", "@umijs/bundler-vite/compiled/vite"]
+  ["tapable", "@umijs/bundler-utils/compiled/tapable"]
 ]);
 import_deepImports.default.forEach((item) => {
   const name = item.split("/").pop();

package/dist/utils/resolveProjectDep.d.ts

@@ -3,3 +3,8 @@ export declare function resolveProjectDep(opts: {
     cwd: string;
     dep: string;
 }): string | undefined;
+export declare function resolveVuePath(opts: {
+    pkg: any;
+    cwd: string;
+    path: string;
+}): string;

package/dist/utils/resolveProjectDep.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,12 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/utils/resolveProjectDep.ts
 var resolveProjectDep_exports = {};
 __export(resolveProjectDep_exports, {
-  resolveProjectDep: () => resolveProjectDep
+  resolveProjectDep: () => resolveProjectDep,
+  resolveVuePath: () => resolveVuePath
 });
 module.exports = __toCommonJS(resolveProjectDep_exports);
 var import_path = require("path");
@@ -32,7 +36,16 @@ function resolveProjectDep(opts) {
     }));
   }
 }
+function resolveVuePath(opts) {
+  const vuePkgPath = resolveProjectDep({
+    pkg: opts.pkg,
+    cwd: opts.cwd,
+    dep: "vue"
+  }) || (0, import_path.dirname)(require.resolve("vue/package.json"));
+  return (0, import_path.join)(vuePkgPath, opts.path);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  resolveProjectDep
+  resolveProjectDep,
+  resolveVuePath
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-vue",
-  "version": "4.0.0-canary.20220729.2",
+  "version": "4.0.0-canary.20220819.1",
   "description": "@umijs/preset-vue",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-vue#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -22,14 +22,14 @@
     "dev": "umi-scripts father dev"
   },
   "dependencies": {
-    "@umijs/renderer-vue": "4.0.0-canary.20220729.2",
+    "@umijs/renderer-vue": "4.0.0-canary.20220819.1",
     "vue": "3.2.36",
     "vue-loader": "17.0.0",
     "vue-router": "4.0.15"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "2.3.1",
-    "umi": "4.0.0-canary.20220729.2"
+    "umi": "4.0.0-canary.20220819.1"
   },
   "publishConfig": {
     "access": "public"