Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dcloudio/uni-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.0-alpha-3070120230208001
Choose a base ref
...
head repository: dcloudio/uni-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.0-alpha-3070120230210001
Choose a head ref
  • 14 commits
  • 68 files changed
  • 5 contributors

Commits on Feb 8, 2023

  1. Copy the full SHA
    d66244f View commit details

Commits on Feb 9, 2023

  1. Copy the full SHA
    a1c728c View commit details
  2. Copy the full SHA
    067d872 View commit details
  3. wip(uts): compiler

    fxy060608 committed Feb 9, 2023
    Copy the full SHA
    580f105 View commit details
  4. fix: AsyncApiOptions

    zhetengbiji committed Feb 9, 2023
    Copy the full SHA
    1ccb30b View commit details
  5. Copy the full SHA
    f95ef3a View commit details
  6. Copy the full SHA
    ee93743 View commit details

Commits on Feb 10, 2023

  1. wip(uts): compiler

    fxy060608 committed Feb 10, 2023
    Copy the full SHA
    29cc45d View commit details
  2. Copy the full SHA
    41bde3d View commit details
  3. wip(uts): compiler

    fxy060608 committed Feb 10, 2023
    Copy the full SHA
    4729761 View commit details
  4. Copy the full SHA
    59a0d83 View commit details
  5. chore: build

    zhetengbiji committed Feb 10, 2023
    Copy the full SHA
    9cf7faa View commit details
  6. release: v3.0.0-alpha-3070120230208001

    r-u committed Feb 10, 2023
    Copy the full SHA
    9ff921d View commit details
  7. release: v3.0.0-alpha-3070120230210001

    r-u committed Feb 10, 2023
    Copy the full SHA
    a44991e View commit details
Showing with 584 additions and 309 deletions.
  1. +3 −3 package.json
  2. +21 −0 packages/playground/__tests__/nvue.spec.ts
  3. +22 −0 packages/playground/nvue/index.html
  4. +27 −0 packages/playground/nvue/package.json
  5. +3 −0 packages/playground/nvue/src/App.vue
  6. +20 −0 packages/playground/nvue/src/index.html
  7. +9 −0 packages/playground/nvue/src/main.js
  8. +72 −0 packages/playground/nvue/src/manifest.json
  9. +17 −0 packages/playground/nvue/src/pages.json
  10. +19 −0 packages/playground/nvue/src/pages/index/index.nvue
  11. +10 −0 packages/playground/nvue/vite.config.js
  12. +6 −6 packages/size-check/package.json
  13. +2 −2 packages/uni-api/package.json
  14. +1 −1 packages/uni-api/src/type.ts
  15. +1 −1 packages/uni-app-plus/dist/uni-app-view.umd.js
  16. +8 −8 packages/uni-app-plus/package.json
  17. +5 −5 packages/uni-app-vite/package.json
  18. +2 −2 packages/uni-app-vue/package.json
  19. +7 −7 packages/uni-app/package.json
  20. +2 −2 packages/uni-automator/package.json
  21. +4 −4 packages/uni-cli-shared/package.json
  22. +4 −4 packages/uni-cloud/package.json
  23. +2 −2 packages/uni-components/package.json
  24. +25 −13 packages/uni-components/src/vue/navigator/index.tsx
  25. +4 −4 packages/uni-core/package.json
  26. +3 −3 packages/uni-h5-vite/package.json
  27. +2 −2 packages/uni-h5-vue/package.json
  28. +14 −8 packages/uni-h5/dist/uni-h5.cjs.js
  29. +14 −8 packages/uni-h5/dist/uni-h5.es.js
  30. +6 −6 packages/uni-h5/package.json
  31. +1 −1 packages/uni-i18n/package.json
  32. +5 −5 packages/uni-mp-alipay/package.json
  33. +7 −7 packages/uni-mp-baidu/package.json
  34. +3 −3 packages/uni-mp-compiler/package.json
  35. +1 −1 packages/uni-mp-core/package.json
  36. +7 −7 packages/uni-mp-kuaishou/package.json
  37. +7 −7 packages/uni-mp-lark/package.json
  38. +6 −6 packages/uni-mp-qq/package.json
  39. +6 −6 packages/uni-mp-toutiao/package.json
  40. +6 −6 packages/uni-mp-vite/package.json
  41. +1 −1 packages/uni-mp-vite/src/plugins/usingComponents.ts
  42. +3 −3 packages/uni-mp-vue/package.json
  43. +5 −5 packages/uni-mp-weixin/package.json
  44. +1 −1 packages/uni-nvue-styler/package.json
  45. +2 −2 packages/uni-push/package.json
  46. +5 −5 packages/uni-quickapp-webview/package.json
  47. +1 −1 packages/uni-shared/package.json
  48. +1 −1 packages/uni-stacktracey/package.json
  49. +3 −3 packages/uni-stat/package.json
  50. +2 −2 packages/uni-uts-v1/package.json
  51. +2 −2 packages/uni-vue-devtools/package.json
  52. +3 −3 packages/uni-vue/package.json
  53. +1 −1 packages/uts-darwin-arm64/package.json
  54. BIN packages/uts-darwin-arm64/uts.darwin-arm64.node
  55. +1 −1 packages/uts-darwin-x64/package.json
  56. BIN packages/uts-darwin-x64/uts.darwin-x64.node
  57. +1 −1 packages/uts-linux-x64-gnu/package.json
  58. BIN packages/uts-linux-x64-gnu/uts.linux-x64-gnu.node
  59. +1 −1 packages/uts-linux-x64-musl/package.json
  60. BIN packages/uts-linux-x64-musl/uts.linux-x64-musl.node
  61. +1 −1 packages/uts-win32-ia32-msvc/package.json
  62. BIN packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
  63. +1 −1 packages/uts-win32-x64-msvc/package.json
  64. BIN packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
  65. +7 −7 packages/uts/package.json
  66. +4 −0 packages/uts/src/types.ts
  67. +3 −3 packages/vite-plugin-uni/package.json
  68. +151 −124 pnpm-lock.yaml
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"workspaces": [
"packages/*"
],
@@ -43,8 +43,8 @@
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.16.11",
"@dcloudio/types": "3.2.11",
"@dcloudio/uni-api": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-app": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-api": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-app": "3.0.0-alpha-3070120230210001",
"@jest/types": "^29.0.3",
"@microsoft/api-extractor": "^7.33.6",
"@rollup/plugin-alias": "^4.0.2",
21 changes: 21 additions & 0 deletions packages/playground/__tests__/nvue.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const execa = require('execa')
const fs = require('fs')

const nvuePath = require('path').resolve(__dirname, '../nvue')

beforeAll(async () => {
await execa('npm run', ['build:app'], {
cwd: nvuePath,
})
})

describe('nvue playground', () => {
jest.setTimeout(50 * 1000)
test('template scroll-view', () => {
const s = fs.readFileSync(
require('path').resolve(nvuePath, 'dist/build/app/pages/index/index.js'),
{ encoding: 'utf8' }
)
expect(s).toContain('scroll-view')
})
})
22 changes: 22 additions & 0 deletions packages/playground/nvue/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
<!--head-meta-->
<!--preload-links-->
<script>
document.addEventListener('DOMContentLoaded', function () {
document.documentElement.style.fontSize =
document.documentElement.clientWidth / 23.4375 + 'px'
})
</script>
<!--app-context-->
</head>
<body>
<div id="ssr-log"></div>
<div id="app"><!--app-html--></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
27 changes: 27 additions & 0 deletions packages/playground/nvue/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "ssr",
"private": true,
"version": "0.0.0",
"scripts": {
"clean": "rm -rf node_modules && rm -rf package-lock.json && pnpm i",
"dev": "uni -d",
"build": "uni build",
"dev:app": "uni -p app",
"build:app": "uni build -p app"
},
"dependencies": {
"@dcloudio/uni-app": "../../uni-app",
"@dcloudio/uni-app-plus": "../../uni-app-plus",
"@dcloudio/uni-components": "../../uni-components",
"vue": "3.2.47",
"vue-router": "^4.1.6",
"vuex": "^4.1.0"
},
"devDependencies": {
"@dcloudio/vite-plugin-uni": "../../vite-plugin-uni",
"vite": "^4.1.0"
},
"resolutions": {
"@dcloudio/uni-app-vite": "../../uni-app-vite"
}
}
3 changes: 3 additions & 0 deletions packages/playground/nvue/src/App.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<script>
export default {}
</script>
20 changes: 20 additions & 0 deletions packages/playground/nvue/src/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<script>
var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
CSS.supports('top: constant(a)'))
document.write(
'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
(coverSupport ? ', viewport-fit=cover' : '') + '" />')
</script>
<title></title>
<!--preload-links-->
<!--app-context-->
</head>
<body>
<div id="app"><!--app-html--></div>
<script type="module" src="/main.js"></script>
</body>
</html>
9 changes: 9 additions & 0 deletions packages/playground/nvue/src/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import App from './App'

import { createSSRApp } from 'vue'
export function createApp() {
const app = createSSRApp(App)
return {
app
}
}
72 changes: 72 additions & 0 deletions packages/playground/nvue/src/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"name" : "nvue-template-test",
"appid" : "__UNI__9B42BAE",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* 模块配置 */
"modules" : {},
/* 应用发布信息 */
"distribute" : {
/* android打包配置 */
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
/* ios打包配置 */
"ios" : {},
/* SDK配置 */
"sdkConfigs" : {}
}
},
/* 快应用特有相关 */
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "",
"setting" : {
"urlCheck" : false
},
"usingComponents" : true
},
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics" : {
"enable" : false
},
"vueVersion" : "3"
}
17 changes: 17 additions & 0 deletions packages/playground/nvue/src/pages.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "uni-app"
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
}
19 changes: 19 additions & 0 deletions packages/playground/nvue/src/pages/index/index.nvue
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<view class="content">
<view class="text-area">
<text class="title">{{ title }}</text>
</view>
</view>
</template>

<script>
export default {
data() {
return {
title: 'Hello',
}
},
onLoad() {},
methods: {},
}
</script>
10 changes: 10 additions & 0 deletions packages/playground/nvue/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { defineConfig } from 'vite'
import uni from '@dcloudio/vite-plugin-uni'

/**
* @type {import('vite').UserConfig}
*/
export default defineConfig({
build: { minify: false },
plugins: [uni({ viteLegacyOptions: false })],
})
12 changes: 6 additions & 6 deletions packages/size-check/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"private": true,
"name": "@dcloudio/size-check",
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-h5": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-app": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-h5": "3.0.0-alpha-3070120230210001",
"vue": "3.2.47",
"vue-i18n": "9.1.9",
"vuex": "^4.1.0"
},
"devDependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-components": "3.0.0-alpha-3070120230207001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3070120230207001"
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-components": "3.0.0-alpha-3070120230210001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3070120230210001"
}
}
4 changes: 2 additions & 2 deletions packages/uni-api/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@dcloudio/uni-api",
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"description": "@dcloudio/uni-api",
"sideEffects": false,
"module": "src/index.ts",
@@ -18,6 +18,6 @@
"@vue/shared": "3.2.47"
},
"devDependencies": {
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230207001"
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230210001"
}
}
2 changes: 1 addition & 1 deletion packages/uni-api/src/type.ts
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ type TaskApiLike = ApiLike

type AsyncApiLike = (args: any) => Promise<unknown> | void

type AsyncApiOptions<T extends ApiLike> = Parameters<T>[0]
type AsyncApiOptions<T extends ApiLike> = Required<Parameters<T>>[0]

type AsyncApiRes<T extends AsyncMethodOptionLike> = Omit<
Parameters<Exclude<T['success'], undefined>>[0],
2 changes: 1 addition & 1 deletion packages/uni-app-plus/dist/uni-app-view.umd.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions packages/uni-app-plus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-plus",
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"description": "@dcloudio/uni-app-plus",
"files": [
"dist",
@@ -28,19 +28,19 @@
"main": "dist/uni.compiler.js"
},
"dependencies": {
"@dcloudio/uni-app-vite": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-app-vue": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-app-vite": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-app-vue": "3.0.0-alpha-3070120230210001",
"debug": "^4.3.3",
"fs-extra": "^10.0.0",
"licia": "^1.29.0",
"postcss-selector-parser": "^6.0.6"
},
"devDependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-components": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-h5": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-components": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-h5": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230210001",
"@types/pako": "1.0.2",
"@vue/compiler-sfc": "3.2.47",
"autoprefixer": "^10.4.13",
10 changes: 5 additions & 5 deletions packages/uni-app-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-vite",
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"description": "uni-app-vite",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@@ -20,10 +20,10 @@
"license": "Apache-2.0",
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@dcloudio/uni-nvue-styler": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230207001",
"@dcloudio/uni-nvue-styler": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070120230210001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230210001",
"@rollup/pluginutils": "^4.2.0",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/compiler-dom": "3.2.47",
4 changes: 2 additions & 2 deletions packages/uni-app-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-vue",
"version": "3.0.0-alpha-3070120230207001",
"version": "3.0.0-alpha-3070120230210001",
"description": "@dcloudio/uni-app-vue",
"main": "dist/service.runtime.esm.dev.js",
"module": "dist/service.runtime.esm.dev.js",
@@ -19,6 +19,6 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"devDependencies": {
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230207001"
"@dcloudio/uni-shared": "3.0.0-alpha-3070120230210001"
}
}
Loading