Merge branch 'feat-web-components' into dev

packages/uni-template-compiler/__tests__/compiler-app-plus-extra.view.spec.js

@@ -44,7 +44,7 @@ describe('codegen', () => {
   it('generate text with multiple statements', () => {
     assertCodegen(
       `<view>{{obj.param1}}123123{{obj.param1}}123123{{obj.param1}}<text> -{{obj.param3}}---{{obj.param3}} </text>{{obj.param2}}aaaa{{obj.param2}}aaaa{{obj.param2}}</view>`,
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+"123123"+(_$g(0,'t0-1'))+"123123"+(_$g(0,'t0-2'))),_c('v-uni-text',{attrs:{"_i":1}},[_v("-"+(_$g(1,'t0-0'))+"---"+(_$g(1,'t0-1')))]),_v((_$g(0,'t2-0'))+"aaaa"+(_$g(0,'t2-1'))+"aaaa"+(_$g(0,'t2-2')))],1)}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+"123123"+(_$g(0,'t0-1'))+"123123"+(_$g(0,'t0-2'))),_c('v-uni-text',{attrs:{"_i":1}},[_v("-"+(_$g(1,'t0-0'))+"---"+(_$g(1,'t0-1')))]),_v((_$g(0,'t2-0'))+"aaaa"+(_$g(0,'t2-1'))+"aaaa"+(_$g(0,'t2-2')))],1)}`
     )
   })
   it('generate v-slot', () => {
@@ -68,18 +68,18 @@ describe('codegen', () => {
       '<p :change:prop="swipe.sizeReady" :prop="pos" @touchstart="swipe.touchstart" @touchmove="swipe.touchmove" @touchend="swipe.touchend" @change="change"></p>',
       `with(this){return _c('p',{wxsProps:{"change:prop":"pos"},attrs:{"change:prop":swipe.sizeReady,"prop":_$gc(0,'change:pos'),"_i":0},on:{"touchstart":function($event){$event = $handleWxsEvent($event);swipe.touchstart($event, $getComponentDescriptor())},"touchmove":function($event){$event = $handleWxsEvent($event);swipe.touchmove($event, $getComponentDescriptor())},"touchend":function($event){$event = $handleWxsEvent($event);swipe.touchend($event, $getComponentDescriptor())},"change":function($event){return $handleViewEvent($event)}}})}`
     )
-  })
-
-  it('generate staticClass and id', () => {
-    assertCodegen(
-      '<custom id="id"></custom>',
-      `with(this){return _c('custom',{attrs:{"id":"id","_i":0}})}`
-    )
-    assertCodegen(
-      '<custom :id="id"></custom>',
-      `with(this){return _c('custom',{attrs:{"id":_$g(0,'a-id'),"_i":0}})}`
-    )
-  })
+  })
+
+  it('generate staticClass and id', () => {
+    assertCodegen(
+      '<custom id="id"></custom>',
+      `with(this){return _c('custom',{attrs:{"id":"id","_i":0}})}`
+    )
+    assertCodegen(
+      '<custom :id="id"></custom>',
+      `with(this){return _c('custom',{attrs:{"id":_$g(0,'a-id'),"_i":0}})}`
+    )
+  })
 
   // TODO 后续优化dataset
   // it('generate dataset', () => {
@@ -91,11 +91,11 @@ describe('codegen', () => {
   it('generate dataset', () => {
     assertCodegen(
       '<view data-a="1" :data-b="b"></view>',
-      `with(this){return _c('v-uni-view',{attrs:{"data-a":"1","data-b":_$g(0,'a-data-b'),"_i":0}})}`
-    )
-    assertCodegen(
-      '<custom data-a="1" :data-b="b"></custom>',
-      `with(this){return _c('custom',{attrs:{"data-a":"1","data-b":_$g(0,'a-data-b'),"_i":0}})}`
+      `with(this){return _c('uni-view',{attrs:{"data-a":"1","data-b":_$g(0,'a-data-b'),"_i":0}})}`
+    )
+    assertCodegen(
+      '<custom data-a="1" :data-b="b"></custom>',
+      `with(this){return _c('custom',{attrs:{"data-a":"1","data-b":_$g(0,'a-data-b'),"_i":0}})}`
     )
   })
   it('generate v-if directive', () => {
@@ -141,12 +141,12 @@ describe('codegen', () => {
   it('generate text trim', () => {
     assertCodegen(
       '<view>text</view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v("text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v("text")])}`
     )
 
     assertCodegen(
       '<view> text </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v("text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v("text")])}`
     )
 
     assertCodegen(
@@ -179,42 +179,42 @@ describe('codegen', () => {
 
     assertCodegen(
       '<view> text text </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v("text text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v("text text")])}`
     )
     assertCodegen(
       '<view>text {{text}} text</view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v("text "+(_$g(0,'t0-0'))+" text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v("text "+(_$g(0,'t0-0'))+" text")])}`
     )
     assertCodegen(
       '<view> text {{text}} 文本 </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v("text "+(_$g(0,'t0-0'))+" 文本")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v("text "+(_$g(0,'t0-0'))+" 文本")])}`
     )
     assertCodegen(
       '<view>{{text}} text  text </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text")])}`
     )
     assertCodegen(
       '<view>  {{text}} text  text </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text")])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text")])}`
     )
     assertCodegen(
       '<view>{{text}} text  text {{text}}</view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text "+(_$g(0,'t0-1')))])}`
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text "+(_$g(0,'t0-1')))])}`
     )
     assertCodegen(
       '<view>  {{text}} text  text {{text}}  </view>',
-      `with(this){return _c('v-uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text "+(_$g(0,'t0-1')))])}`
-    )
-  })
-  it('generate bool attr', () => {
-    assertCodegen(
-      '<video controls/>',
-      `with(this){return _c('v-uni-video',{attrs:{"controls":true,"_i":0}})}`
-    )
-    assertCodegen(
-      '<video controls=""/>',
-      `with(this){return _c('v-uni-video',{attrs:{"controls":"","_i":0}})}`
-    )
+      `with(this){return _c('uni-view',{attrs:{"_i":0}},[_v((_$g(0,'t0-0'))+" text  text "+(_$g(0,'t0-1')))])}`
+    )
+  })
+  it('generate bool attr', () => {
+    assertCodegen(
+      '<video controls/>',
+      `with(this){return _c('v-uni-video',{attrs:{"controls":true,"_i":0}})}`
+    )
+    assertCodegen(
+      '<video controls=""/>',
+      `with(this){return _c('v-uni-video',{attrs:{"controls":"","_i":0}})}`
+    )
   })
 })
-/* eslint-enable quotes */
+/* eslint-enable quotes */