Merge branch 'master' of github.com:cuixiaorui/mini-vue

mohcanohca · Jun 22, 2022 · 29078ac · 29078ac
2 parents 5bb98eb + 0a5ed74
commit 29078ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/reactivity/yarn.lock b/src/reactivity/yarn.lock
@@ -2730,9 +2730,9 @@ minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 [email protected]:
   version "2.1.2"

diff --git a/src/runtime-core/component.ts b/src/runtime-core/component.ts
@@ -125,7 +125,7 @@ function finishComponentSetup(instance) {
   const Component = instance.type;
 
   if (!instance.render) {
-    // 如果 compile 有值 并且当然组件没有 render 函数，那么就需要把 template 编译成 render 函数
+    // 如果 compile 有值 并且当组件没有 render 函数，那么就需要把 template 编译成 render 函数
     if (compile && !Component.render) {
       if (Component.template) {
         // 这里就是 runtime 模块和 compile 模块结合点

diff --git a/src/runtime-core/helpers/renderSlot.ts b/src/runtime-core/helpers/renderSlot.ts
@@ -1,4 +1,3 @@
-import { getCurrentInstance } from "../component";
 import { createVNode, Fragment } from "../vnode";
 
 /**