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-3071220230331001
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-3071220230331002
Choose a head ref
  • 7 commits
  • 54 files changed
  • 4 contributors

Commits on Mar 31, 2023

  1. fix(manifest): app-plus/nvue/flex-direction (question/165497)

    @zhenyuWang
    zhenyuWang committed Mar 31, 2023
    Copy the full SHA
    b139043 View commit details

  2. wip(uts): compiler

    @fxy060608
    fxy060608 committed Mar 31, 2023
    Copy the full SHA
    c049f19 View commit details

  3. fix(manifest): app-plus/nvue/flex-direction (question/165497)

    @zhenyuWang
    zhenyuWang committed Mar 31, 2023
    Copy the full SHA
    d59b024 View commit details

  4. wip(uts): compiler

    @fxy060608
    fxy060608 committed Mar 31, 2023
    Copy the full SHA
    7d3929d View commit details

  5. wip(uts): compiler

    @fxy060608
    fxy060608 committed Mar 31, 2023
    Copy the full SHA
    673f0b9 View commit details

  6. chore: Merge remote-tracking branch 'origin/next' into next-publish-a… 

    …lpha
    @zhetengbiji
    zhetengbiji committed Mar 31, 2023
    Copy the full SHA
    0ed8473 View commit details

  7. release: v3.0.0-alpha-3071220230331002

    r-u committed Mar 31, 2023
    Copy the full SHA
    db0f8f3 View commit details
Showing with 306 additions and 291 deletions.
  1. +3 −3 package.json
  2. +6 −6 packages/size-check/package.json
  3. +2 −2 packages/uni-api/package.json
  4. +8 −8 packages/uni-app-plus/package.json
  5. +5 −5 packages/uni-app-vite/package.json
  6. +2 −2 packages/uni-app-vue/package.json
  7. +7 −7 packages/uni-app/package.json
  8. +2 −2 packages/uni-automator/package.json
  9. +4 −4 packages/uni-cli-shared/package.json
  10. +8 −5 packages/uni-cli-shared/src/json/app/manifest/nvue.ts
  11. +23 −11 packages/uni-cli-shared/src/uni_modules.ts
  12. +4 −4 packages/uni-cloud/package.json
  13. +2 −2 packages/uni-components/package.json
  14. +4 −4 packages/uni-core/package.json
  15. +3 −3 packages/uni-h5-vite/package.json
  16. +2 −2 packages/uni-h5-vue/package.json
  17. +6 −6 packages/uni-h5/package.json
  18. +1 −1 packages/uni-i18n/package.json
  19. +5 −5 packages/uni-mp-alipay/package.json
  20. +7 −7 packages/uni-mp-baidu/package.json
  21. +3 −3 packages/uni-mp-compiler/package.json
  22. +1 −1 packages/uni-mp-core/package.json
  23. +7 −7 packages/uni-mp-jd/package.json
  24. +7 −7 packages/uni-mp-kuaishou/package.json
  25. +7 −7 packages/uni-mp-lark/package.json
  26. +6 −6 packages/uni-mp-qq/package.json
  27. +6 −6 packages/uni-mp-toutiao/package.json
  28. +6 −6 packages/uni-mp-vite/package.json
  29. +3 −3 packages/uni-mp-vue/package.json
  30. +5 −5 packages/uni-mp-weixin/package.json
  31. +1 −1 packages/uni-nvue-styler/package.json
  32. +2 −2 packages/uni-push/package.json
  33. +5 −5 packages/uni-quickapp-webview/package.json
  34. +1 −1 packages/uni-shared/package.json
  35. +1 −1 packages/uni-stacktracey/package.json
  36. +3 −3 packages/uni-stat/package.json
  37. +2 −2 packages/uni-uts-v1/package.json
  38. +2 −2 packages/uni-vue-devtools/package.json
  39. +3 −3 packages/uni-vue/package.json
  40. +1 −1 packages/uts-darwin-arm64/package.json
  41. BIN packages/uts-darwin-arm64/uts.darwin-arm64.node
  42. +1 −1 packages/uts-darwin-x64/package.json
  43. BIN packages/uts-darwin-x64/uts.darwin-x64.node
  44. +1 −1 packages/uts-linux-x64-gnu/package.json
  45. BIN packages/uts-linux-x64-gnu/uts.linux-x64-gnu.node
  46. +1 −1 packages/uts-linux-x64-musl/package.json
  47. BIN packages/uts-linux-x64-musl/uts.linux-x64-musl.node
  48. +1 −1 packages/uts-win32-ia32-msvc/package.json
  49. BIN packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
  50. +1 −1 packages/uts-win32-x64-msvc/package.json
  51. BIN packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
  52. +7 −7 packages/uts/package.json
  53. +3 −3 packages/vite-plugin-uni/package.json
  54. +115 −115 pnpm-lock.yaml
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"workspaces": [
"packages/*"
],
@@ -43,8 +43,8 @@
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.16.11",
"@dcloudio/types": "3.3.2",
"@dcloudio/uni-api": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-app": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-api": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-app": "3.0.0-alpha-3071220230331002",
"@jest/types": "^29.0.3",
"@microsoft/api-extractor": "^7.33.6",
"@rollup/plugin-alias": "^4.0.2",
12 changes: 6 additions & 6 deletions packages/size-check/package.json
View file
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-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-h5": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-app": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-h5": "3.0.0-alpha-3071220230331002",
"vue": "3.2.47",
"vue-i18n": "9.1.9",
"vuex": "^4.1.0"
},
"devDependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331001",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071220230331001"
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331002",
"@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071220230331002"
}
}
4 changes: 2 additions & 2 deletions packages/uni-api/package.json
View file
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-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"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-3071220230331001"
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002"
}
}
16 changes: 8 additions & 8 deletions packages/uni-app-plus/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-plus",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"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-3071220230331001",
"@dcloudio/uni-app-vue": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-app-vite": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-app-vue": "3.0.0-alpha-3071220230331002",
"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-3071220230331001",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-h5": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-h5": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@types/pako": "1.0.2",
"@vue/compiler-sfc": "3.2.47",
"autoprefixer": "^10.4.14",
10 changes: 5 additions & 5 deletions packages/uni-app-vite/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-vite",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"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-3071220230331001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-nvue-styler": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@rollup/pluginutils": "^4.2.0",
"@vitejs/plugin-vue": "^4.1.0",
"@vue/compiler-dom": "3.2.47",
4 changes: 2 additions & 2 deletions packages/uni-app-vue/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app-vue",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"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-3071220230331001"
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002"
}
}
14 changes: 7 additions & 7 deletions packages/uni-app/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-app",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-app",
"main": "./dist/uni-app.cjs.js",
"module": "./dist/uni-app.es.js",
@@ -24,12 +24,12 @@
"main": "dist/uni.compiler.js"
},
"dependencies": {
"@dcloudio/uni-cloud": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-push": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-stat": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-cloud": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-components": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-push": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-stat": "3.0.0-alpha-3071220230331002",
"@vue/shared": "3.2.47"
},
"peerDependencies": {
4 changes: 2 additions & 2 deletions packages/uni-automator/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-automator",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-automator",
"main": "dist/index.js",
"files": [
@@ -27,7 +27,7 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"address": "^1.1.2",
"cross-env": "^7.0.3",
"debug": "^4.3.3",
8 changes: 4 additions & 4 deletions packages/uni-cli-shared/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-cli-shared",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-cli-shared",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
"@babel/core": "^7.20.5",
"@babel/parser": "^7.20.5",
"@babel/types": "^7.20.7",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@intlify/core-base": "9.1.9",
"@intlify/shared": "9.1.9",
"@intlify/vue-devtools": "9.1.9",
@@ -64,7 +64,7 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"devDependencies": {
"@dcloudio/uni-uts-v1": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-uts-v1": "3.0.0-alpha-3071220230331002",
"@types/babel__core": "^7.1.19",
"@types/debug": "^4.1.7",
"@types/estree": "^0.0.51",
13 changes: 8 additions & 5 deletions packages/uni-cli-shared/src/json/app/manifest/nvue.ts
View file
Original file line number Diff line number Diff line change
@@ -34,11 +34,14 @@ type FlexDir = (typeof flexDirs)[number]

export function getNVueFlexDirection(manifestJson: Record<string, any>) {
let flexDir: FlexDir = 'column'
if (manifestJson['app-plus']?.nvue?.['flex-direction']) {
flexDir = manifestJson['app-plus'].nvue['flex-direction'] as FlexDir
if (flexDirs.indexOf(flexDir) === -1) {
flexDir = 'column'
}
const appPlusJson = manifestJson['app-plus'] || manifestJson['plus']

if (
appPlusJson?.nvue?.['flex-direction'] &&
flexDirs.includes(appPlusJson?.nvue?.['flex-direction'])
) {
flexDir = appPlusJson.nvue['flex-direction'] as FlexDir
}

return flexDir
}
34 changes: 23 additions & 11 deletions packages/uni-cli-shared/src/uni_modules.ts
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,12 @@ export function parseUniExtApis(vite = true) {
if (!fs.existsSync(uniModulesDir)) {
return {}
}

let platform = process.env.UNI_PLATFORM
if (platform === 'h5') {
platform = 'web'
} else if (platform === 'app-plus') {
platform = 'app'
}
const injects: Injects = {}
fs.readdirSync(uniModulesDir).forEach((uniModuleDir) => {
// 必须以 uni- 开头
@@ -43,17 +48,24 @@ export function parseUniExtApis(vite = true) {
const exports = JSON.parse(fs.readFileSync(pkgPath, 'utf8'))
?.uni_modules?.['uni-ext-api'] as Exports | undefined
if (exports) {
Object.assign(
injects,
parseInjects(
vite,
process.env.UNI_PLATFORM === 'h5'
? 'web'
: process.env.UNI_PLATFORM,
`@/uni_modules/${uniModuleDir}`,
exports
)
const curInjects = parseInjects(
vite,
platform,
`@/uni_modules/${uniModuleDir}`,
exports
)
if (platform === 'app') {
Object.keys(curInjects).forEach((name) => {
const options = curInjects[name]
// js 平台禁用了
if (Array.isArray(options) && options.length === 3) {
if (options[2] && (options[2] as any).js === false) {
delete curInjects[name]
}
}
})
}
Object.assign(injects, curInjects)
}
} catch (e) {}
})
8 changes: 4 additions & 4 deletions packages/uni-cloud/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-cloud",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-cloud",
"main": "dist/uni-cloud.cjs.js",
"module": "dist/uni-cloud.es.js",
@@ -20,9 +20,9 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@vue/shared": "3.2.47",
"fast-glob": "^3.2.11"
}
4 changes: 2 additions & 2 deletions packages/uni-components/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-components",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-components",
"main": "index.js",
"files": [
@@ -18,7 +18,7 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"devDependencies": {
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@types/quill": "^1.3.7"
}
}
8 changes: 4 additions & 4 deletions packages/uni-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@dcloudio/uni-core",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-core",
"sideEffects": false,
"repository": {
@@ -14,9 +14,9 @@
"url": "https://github.com/dcloudio/uni-app/issues"
},
"devDependencies": {
"@dcloudio/uni-mp-vue": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-mp-vue": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-i18n": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"safe-area-insets": "^1.4.1"
}
}
6 changes: 3 additions & 3 deletions packages/uni-h5-vite/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-h5-vite",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "uni-h5-vite",
"main": "dist/index.js",
"types": "dist/index.d.ts",
@@ -19,8 +19,8 @@
"license": "Apache-2.0",
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3071220230331002",
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002",
"@rollup/pluginutils": "^4.2.0",
"@vue/compiler-dom": "3.2.47",
"@vue/compiler-sfc": "3.2.47",
4 changes: 2 additions & 2 deletions packages/uni-h5-vue/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dcloudio/uni-h5-vue",
"version": "3.0.0-alpha-3071220230331001",
"version": "3.0.0-alpha-3071220230331002",
"description": "@dcloudio/uni-h5-vue",
"main": "dist/vue.runtime.cjs.js",
"module": "dist/vue.runtime.esm.js",
@@ -19,6 +19,6 @@
},
"gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
"dependencies": {
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331001"
"@dcloudio/uni-shared": "3.0.0-alpha-3071220230331002"
}
}
Loading