Merge branch 'dcloudio:next' into pr_1

Author: acyza

packages/playground/__tests__/__snapshots__/uni_modules.spec.ts.snap

@@ -2,6 +2,7 @@ import fs from 'fs-extra'
 import path from 'path'
 import execa from 'execa'
 import { sync } from 'fast-glob'
+import { normalizePath } from '@dcloudio/uni-cli-shared'
 
 const projectDir = path.resolve(__dirname, '../uni_modules')
 
@@ -57,26 +58,30 @@ describe('uni_modules playground', () => {
             UNI_APP_X: type === 'uni-app-x' ? 'true' : 'false',
           },
         })
+        const files = sync('**/*', { cwd: outDir, absolute: true }).sort()
         sync('**/*', { cwd: outDir, absolute: true })
-          .sort()
-          .forEach((file) => {
-            if (file.endsWith('.png')) {
-              expect(path.basename(file)).toMatchSnapshot()
-            } else {
-              expect(
-                fs
-                  .readFileSync(file, 'utf-8')
-                  .replace(
-                    `"compilerVersion": "${
-                      require('../../vite-plugin-uni/package.json')['uni-app'][
-                        'compilerVersion'
-                      ]
-                    }"`,
-                    `"compilerVersion": "x.xx"`
-                  )
-              ).toMatchSnapshot()
-            }
-          })
+        expect(
+          files.map((file) => normalizePath(file).split('/uni-app-x/')[1])
+        ).toMatchSnapshot()
+        files.forEach((file) => {
+          if (file.endsWith('.png')) {
+            expect(path.basename(file)).toMatchSnapshot()
+          } else {
+            expect(
+              fs
+                .readFileSync(file, 'utf-8')
+                .replace(
+                  `"compilerVersion": "${
+                    require('../../vite-plugin-uni/package.json')['uni-app'][
+                      'compilerVersion'
+                    ]
+                  }"`,
+                  `"compilerVersion": "x.xx"`
+                )
+                .replaceAll(projectDir, '')
+            ).toMatchSnapshot()
+          }
+        })
       })
     })
   })

packages/playground/__tests__/uni_modules.spec.ts

@@ -0,0 +1,79 @@
+type ShowToast = (msg: string) => void;
+import { UIDevice } from 'UIKit';
+import { CLLocationManager, CLAuthorizationStatus } from 'CoreLocation';
+type GetBatteryInfoOptions = {
+    name: string;
+    pwd: number;
+    success?: (res: UTSJSONObject) => void;
+    fail?: (res: UTSJSONObject) => void;
+    complete?: (res: UTSJSONObject) => void;
+};
+function getBatteryInfo(options: GetBatteryInfoOptions) {
+    new UIAlertController(title = title, message = message, preferredStyle = UIAlertController.Style.alert);
+    const res = {
+        errMsg: 'getBatteryInfo:ok',
+        level: UIDevice.current.batteryLevel * 100,
+        isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging
+    };
+    if (options.success != null) {
+        options.success!(res);
+    }
+    if (options.complete != null) {
+        options.complete!(res);
+    }
+}
+function test1(callback: () => void): string {
+    console.log({
+        "a": "b"
+    }, " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:33");
+    console.log('test1', " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:34");
+    console.log('ndef android', " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:42");
+    console.log('ndef ios', " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:45");
+    console.log(CLLocationManager, CLAuthorizationStatus, " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:53");
+    const a = -3;
+    console.log(~a, " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:55");
+    return 'test1';
+}
+class Test1 {
+}
+class Test {
+    constructor(){
+        new Test1();
+    }
+    test(): string | null {
+        if (UTSiOS.macros("swift(>=1)")) {
+            console.log("swift(>=1)", " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:66");
+        }
+        if (UTSiOS.macros("arch(i386) || arch(arm)")) {
+            console.log("arch(i386) || arch(arm)", " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:69");
+        }
+        if (UTSiOS.available("iOS 14, macOS 11.0, *")) {
+            console.log("iOS 14, macOS 11.0, *", " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:72");
+        } else if (UTSiOS.available("iOS 13,*")) {
+            console.log("iOS 13,*", " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:74");
+        } else if (UTSiOS.unavailable("tvOS 12")) {
+            console.log("tvOS 12", " at uni_modules/test-uniplugin/utssdk/app-ios/index.uts:76");
+        }
+        return null;
+    }
+}
+async function testAsync() {
+    .showToast();
+    .showToast();
+    .showModel();
+    return {
+        a: 1
+    };
+}
+const showToast1: ShowToast = (msg)=>{};
+const showToast2: ShowToast = function(msg) {};
+const showToast3: ShowToast = function showToast(msg) {};
+export { getBatteryInfo as default };
+export { test1 as test1 };
+export { Test as Test };
+export { testAsync as testAsync };
+export { showToast1 as showToast1 };
+export { showToast2 as showToast2 };
+export { showToast3 as showToast3 };
+import { showToast } from "";
+import { showModel } from "";

packages/playground/uts/unpackage/dist/dev/.sourcemap/app/uni_modules/test-uniplugin/utssdk/app-ios/index.ets.map

@@ -2,12 +2,16 @@ declare var __WEEX_DEVTOOL__: any
 //#region import
 import {
   API_CREATE_CANVAS_CONTEXT,
+  type API_TYPE_CREATE_CANVAS_CONTEXT,
   CreateCanvasContextProtocol,
 } from '../../protocols/context/context'
 import {
   API_CANVAS_GET_IMAGE_DATA,
   API_CANVAS_PUT_IMAGE_DATA,
   API_CANVAS_TO_TEMP_FILE_PATH,
+  type API_TYPE_CANVAS_GET_IMAGE_DATA,
+  type API_TYPE_CANVAS_PUT_IMAGE_DATA,
+  type API_TYPE_CANVAS_TO_TEMP_FILE_PATH,
   CanvasGetImageDataOptions,
   CanvasGetImageDataProtocol,
   CanvasPutImageDataOptions,
@@ -18,13 +22,6 @@ import {
 
 import { defineAsyncApi, defineSyncApi } from '../../helpers/api'
 
-import type {
-  API_TYPE_CANVAS_GET_IMAGE_DATA,
-  API_TYPE_CANVAS_PUT_IMAGE_DATA,
-  API_TYPE_CANVAS_TO_TEMP_FILE_PATH,
-  API_TYPE_CREATE_CANVAS_CONTEXT,
-} from '@dcloudio/uni-api'
-
 import { hasOwn } from '@vue/shared'
 
 import { ON_ERROR, once } from '@dcloudio/uni-shared'

packages/playground/uts/unpackage/dist/dev/app-plus/uni_modules/test-uniplugin/utssdk/app-ios/index.ets

@@ -3,6 +3,7 @@ import {
   findEncryptUniModules,
   findUploadEncryptUniModulesFiles,
 } from '../src/uni_modules'
+import { normalizePath } from '../src/utils'
 
 const platforms = ['app-android', 'app-ios', 'web'] as const
 describe('uni_modules:uni-ext-api', () => {
@@ -24,7 +25,7 @@ describe('uni_modules:uni-ext-api', () => {
       expect(
         Object.keys(modules).reduce((res: string[], id: string) => {
           res.push(
-            ...modules[id].map((item) => item.replace(inputDir, '').slice(1))
+            ...modules[id].map((item) => normalizePath(item).split('/src/')[1])
           )
           return res
         }, [])

packages/uni-api/src/service/context/canvas.ts

@@ -1,9 +1,18 @@
-import type { NodeTransform } from '@vue/compiler-core'
+import type { ElementNode, NodeTransform } from '@vue/compiler-core'
+import { ElementTypes } from '@vue/compiler-core'
 import { checkElementNodeTag } from '../../utils'
 
 export const transformPageHead: NodeTransform = (node, context) => {
   // 发现是page-meta下的head,直接remove该节点
-  checkElementNodeTag(node, 'head') &&
-    checkElementNodeTag(context.parent, 'page-meta') &&
-    context.removeNode(node)
+  if (
+    checkElementNodeTag(node, 'head') &&
+    checkElementNodeTag(context.parent, 'page-meta')
+  ) {
+    if (process.env.UNI_APP_X === 'true') {
+      ;(node as ElementNode).tag = 'page-meta-head'
+      ;(node as ElementNode).tagType = ElementTypes.COMPONENT
+    } else {
+      context.removeNode(node)
+    }
+  }
 }

packages/uni-app-plus/dist/uni-app-view.umd.js

@@ -64,20 +64,44 @@ describe('test: helpers/useField.ts', () => {
     const mockRef = ref(null)
     const mockEmit = jest.fn()
 
+    // blank modelValue > value
     mockProps.modelValue = ''
     mockProps.value = '禁用'
     const { state } = useField(mockProps, mockRef, mockEmit)
     expect(state.value).toBe('')
 
+    // blank modelValue > value
+    mockProps.modelValue = '禁用1'
+    mockProps.value = ''
+    const { state: state0 } = useField(mockProps, mockRef, mockEmit)
+    expect(state0.value).toBe('禁用1')
+
+    // normal modelValue > value
     mockProps.modelValue = '禁用2'
     mockProps.value = '禁用'
-    const { state: state2 } = useField(mockProps, mockRef, mockEmit)
-    expect(state2.value).toBe('禁用2')
+    const { state: state1 } = useField(mockProps, mockRef, mockEmit)
+    expect(state1.value).toBe('禁用2')
 
+    // set modelValue not set value
     // @ts-expect-error
     mockProps.value = undefined
     mockProps.modelValue = '禁用3'
     const { state: state3 } = useField(mockProps, mockRef, mockEmit)
     expect(state3.value).toBe('禁用3')
+
+    // not set modeValue,set value
+    mockProps.value = '禁用4'
+    // @ts-expect-error
+    mockProps.modelValue = undefined
+    const { state: state4 } = useField(mockProps, mockRef, mockEmit)
+    expect(state4.value).toBe('禁用4')
+
+    // 不设置
+    // @ts-expect-error
+    mockProps.value = undefined
+    // @ts-expect-error
+    mockProps.modelValue = undefined
+    const { state: state5 } = useField(mockProps, mockRef, mockEmit)
+    expect(state5.value).toBe('')
   })
 })

packages/uni-cli-shared/__tests__/uni_modules.spec.ts

@@ -0,0 +1,10 @@
+<template>
+  <teleport to="head">
+    <slot />
+  </teleport>
+</template>
+<script>
+export default {
+  name: 'PageMetaHead',
+}
+</script>