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: 33e807d66e1fe47e2ee08ad9c59247e37b8884da
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-3080020230425001
Choose a head ref

Commits on Nov 5, 2021

  1. Copy the full SHA
    3dee78e View commit details

Commits on Nov 8, 2021

  1. Copy the full SHA
    b6dd974 View commit details

Commits on Nov 9, 2021

  1. workflow: move to pnpm

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    9c11062 View commit details
  2. workflow: size-check.yml

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    4c6e3b0 View commit details
  3. Copy the full SHA
    25c27d5 View commit details
  4. chore: update priority

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    179f49e View commit details
  5. workflow: e2e.yml

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    be6e177 View commit details
  6. workflow: size-check.yml

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    9b52cda View commit details
  7. Copy the full SHA
    7bec973 View commit details
  8. Copy the full SHA
    e3d3829 View commit details
  9. workflow: size-check.yml

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    652c75a View commit details
  10. Copy the full SHA
    62d285a View commit details
  11. Copy the full SHA
    afae001 View commit details
  12. chore: size-check.yml

    fxy060608 committed Nov 9, 2021
    Copy the full SHA
    b079d45 View commit details

Commits on Nov 10, 2021

  1. workflow: size-check.yml

    fxy060608 committed Nov 10, 2021
    Copy the full SHA
    093241e View commit details
  2. Copy the full SHA
    dac7176 View commit details
  3. chore: update versions

    fxy060608 committed Nov 10, 2021
    Copy the full SHA
    3ab5bf8 View commit details
  4. feat: page-meta-head

    Wangyaqi committed Nov 10, 2021
    Copy the full SHA
    f390179 View commit details
  5. feat(ssr): head

    fxy060608 committed Nov 10, 2021
    Copy the full SHA
    373113a View commit details
  6. Copy the full SHA
    bb48903 View commit details
  7. Copy the full SHA
    b2e1e8d View commit details

Commits on Nov 11, 2021

  1. Copy the full SHA
    d596462 View commit details
  2. Copy the full SHA
    260f39c View commit details
  3. wip(app): confusion

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    b464a2f View commit details
  4. Copy the full SHA
    8540385 View commit details
  5. fix(app): tests

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    0a387b8 View commit details
  6. refactor: __isTabBar

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    102c64b View commit details
  7. chore: update deps

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    3315215 View commit details
  8. wip(app): confusion

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    2e0a8f9 View commit details
  9. chore: update types deps

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    028399a View commit details
  10. chore: add prettier ignore

    fxy060608 committed Nov 11, 2021
    Copy the full SHA
    77a4cec View commit details

Commits on Nov 12, 2021

  1. fix(page-meta): support ssr

    dcloudhdx committed Nov 12, 2021
    Copy the full SHA
    2e990d3 View commit details
  2. chore: update deps

    fxy060608 committed Nov 12, 2021
    Copy the full SHA
    84816c2 View commit details
  3. chore: remove unused

    fxy060608 committed Nov 12, 2021
    Copy the full SHA
    d917b55 View commit details
  4. Copy the full SHA
    c521deb View commit details
  5. chore: skipLibCheck

    fxy060608 committed Nov 12, 2021
    Copy the full SHA
    9b11b78 View commit details
  6. Copy the full SHA
    5e07520 View commit details
  7. Copy the full SHA
    1fd1142 View commit details

Commits on Nov 15, 2021

  1. Copy the full SHA
    2f3ffbe View commit details
  2. chore: add checkVersion

    fxy060608 committed Nov 15, 2021
    Copy the full SHA
    f5ff2bb View commit details
  3. Copy the full SHA
    6dd22d5 View commit details

Commits on Nov 16, 2021

  1. wip(nvue): init

    fxy060608 committed Nov 16, 2021
    Copy the full SHA
    1850455 View commit details
  2. refactor: customElements

    fxy060608 committed Nov 16, 2021
    Copy the full SHA
    ce278bc View commit details
  3. Copy the full SHA
    1a37857 View commit details

Commits on Nov 17, 2021

  1. Copy the full SHA
    ecf72e3 View commit details
  2. Copy the full SHA
    e16b48d View commit details
  3. Copy the full SHA
    2e2bc6e View commit details
  4. Copy the full SHA
    b809053 View commit details
  5. chore(hbx): format log

    fxy060608 committed Nov 17, 2021
    Copy the full SHA
    21f6801 View commit details
  6. Copy the full SHA
    13dc9d1 View commit details
Showing 1,464 changed files with 409,203 additions and 220,930 deletions.
8 changes: 6 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ module.exports = {
overrides: [
// tests, no restrictions (runs in Node / jest with jsdom)
{
files: ['**/__tests__/**'],
files: ['**/__tests__/**', '**/dist/**'],
rules: {
'no-restricted-globals': 'off',
'no-restricted-syntax': 'off',
@@ -44,7 +44,11 @@ module.exports = {
// Packages targeting Node
{
files: [
'packages/{uni-cli-shared,uni-cli-nvue,uni-app-vite,uni-h5-vite,uni-mp-vite,uni-mp-compiler,vite-plugin-uni}/**',
'.eslintrc.js',
'jest.config.js',
'rollup.config.mjs',
'scripts/**',
'packages/{uni-cli-shared,uni-app-vite,uni-h5-vite,uni-mp-vite,uni-mp-compiler,vite-plugin-uni,uts,uni-uts-v1}/**',
'packages/*/vite.config.ts',
],
rules: {
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
101 changes: 101 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# uni-app 贡献指南

## 环境搭建

* 需要安装 [Node.js](http://nodejs.org/) 16+,以及 [pnpm](https://pnpm.io/)
* 克隆仓库到本地后,执行 ```pnpm install``` 安装开发依赖。

## 开发

* 执行命令编译指定包,如:```npm run build uni-mp-weixin```
* 执行 ```npm run lint``` 检查代码风格。
* 执行 ```npm run test``` 运行测试。

## 测试

* 创建 uni-app 测试工程。

```
npx degit dcloudio/uni-preset-vue#vite uniapp-test
```
* 从本地安装改动过的依赖

```
pnpm add @dcloudio/%包名%@%uni-app本地仓库路径%/packages/%包名%
```
* 编写测试代码。
* 编译到对应平台进行测试。

## 提交 PR

* fork 本仓库,在自己仓库基于 next 分支创建专用分支用于提交更改。
* commit 规范遵循 Vue 仓库 [Git Commit Message Convention](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md)
* 提交之前确保进行了完善的测试。
* 确保 PR 提交到 next 分支。
* 修复 Bug 请提供详细的描述信息,或链接到对应的 issue。
* 提交新功能请阐明起用途以及提交到主仓库的必要性。除抹平不同平台 API 与组件差异的功能外,最好事先仓库主要成员商议后再进行。


## 项目结构

* packages:uni-app 编译器以及运行时依赖
* uni-cli-shared:编译器共享包
* ``__tests__``:单元测试
* dist:编译后的文件
* lib:其他依赖
* src:源文件
* messages:编译器国际化语言包
* uni-app:框架接口、生命周期等
* uni-api:运行时全局 uni 对象提供的接口,平台公用
* uni-components:运行时全局组件,平台公用
* uni-i18n:国际化依赖包(运行时)
* uni-h5-vite:H5 平台 Vite 插件
* uni-h5-vue:H5 平台使用的 Vue 框架
* uni-h5:H5 平台运行时依赖包
* dist:编译后的文件
* lib:其他依赖
* src:源文件
* compiler:编译器(当前平台独有部分)
* service:逻辑层
* view:视图层
* uni-app-vite:App 平台 Vite 插件
* uni-app-vue:App 平台使用的 Vue 框架
* uni-app-plus:App 平台依赖包
* dist:编译后的文件
* lib:其他依赖
* src:源文件
* compiler:编译器(当前平台独有部分)
* service:逻辑层
* view:视图层
* uni-app-plus-nvue:App(nvue)平台依赖包
* uni-mp-vite:小程序平台 Vite 插件
* uni-mp-vue:小程序平台使用的 Vue 框架
* uni-mp-compiler:小程序编译器(各小程序平台通用部分)
* ``__tests__``:单元测试
* dist:编译后的文件
* lib:其他依赖
* src:源文件
* template:模版编译
* transforms:属性转换
* uni-mp-core:小程序平台运行时(各小程序平台通用部分)
* ``__tests__``:单元测试
* src:源文件
* api:uni 对象接口适配
* runtime:运行时框架生命周期等
* uni-mp-weixin:微信小程序平台依赖包
* dist:编译后的文件
* lib:其他依赖
* src:源文件
* api:uni 对象接口适配,抹平 wx 对象的平台差异
* compiler:编译器(当前平台独有部分)
* runtime:运行时框架生命周期等
* platform:用于为框架提供统一的接口,对应 @dcloudio/uni-platform
* uni-mp-alipay:支付宝小程序平台依赖包
* uni-mp-baidu:百度小程序平台依赖包
* uni-mp-qq:QQ小程序平台依赖包
* uni-mp-toutiao:字节小程序平台依赖包
* uni-mp-kuaishou:快手小程序平台依赖包
* uni-mp-lark:飞书小程序平台依赖包
* uni-quickapp-webview:快应用平台依赖包
* uni-stat:uni统计依赖包
* scripts:编译脚本
35 changes: 14 additions & 21 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node_version: [12]
node_version: [16]
include:
- os: macos-latest
node_version: 12
node_version: 16
- os: windows-latest
node_version: 12
node_version: 16
fail-fast: false
name: 'e2e: node-${{ matrix.node_version }}, ${{ matrix.os }}'
env:
@@ -26,32 +26,25 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Install pnpm
uses: pnpm/action-setup@v2.0.1
with:
version: 6.15.1

- name: Set node version to ${{ matrix.node_version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}
cache: 'pnpm'

- name: Cache node modules
uses: actions/cache@v2
with:
path: ~/.cache
key: ${{ runner.os }}-node${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-node${{ matrix.node_version }}-
- name: Versions
run: yarn versions

- name: Install dependencies
run: yarn install --frozen-lockfile
- run: pnpm install

- name: Build
run: npm run build:h5

- name: Install ssr and verify Cypress
- name: verify Cypress
working-directory: ./packages/playground/ssr
run: |
yarn install --frozen-lockfile
npx cypress verify
npx cypress info
npx cypress version
@@ -61,12 +54,12 @@ jobs:
npx cypress version --component node
- name: Cypress run
uses: cypress-io/github-action@v2.3.6
uses: cypress-io/github-action@v4
with:
install: true
install: false
start: npm run dev:ssr
working-directory: ./packages/playground/ssr
wait-on: 'http://localhost:3000'
wait-on: 'http://localhost:5173'
wait-on-timeout: 480
browser: chrome
env:
28 changes: 15 additions & 13 deletions .github/workflows/size-check.yml
Original file line number Diff line number Diff line change
@@ -8,29 +8,31 @@ on:
- next
jobs:
size:
runs-on: ubuntu-latest
runs-on: windows-latest
env:
CI_JOB_NUMBER: 1
steps:
- uses: actions/checkout@v1
- name: Checkout
uses: actions/checkout@v1

- name: Cache node modules
uses: actions/cache@v2
- name: Install pnpm
uses: pnpm/action-setup@v2.0.1
with:
path: ~/.cache
key: ${{ runner.os }}-node-${{ hashFiles('yarn.lock') }}
restore-keys: |
${{ runner.os }}-node-
version: 7

- name: Versions
run: yarn versions
- name: Set node version to 16
uses: actions/setup-node@v2
with:
node-version: 16
cache: 'pnpm'

- name: Install dependencies
run: yarn install --frozen-lockfile
- run: pnpm install

- uses: fxy060608/size-check-action@v1.1.3
- uses: fxy060608/size-check-action@v1.1.5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
manager: pnpm
build_script: build
files: packages/size-check/dist/size-check.es.js packages/size-check/dist/style.css packages/uni-app/dist/uni-app.es.js packages/uni-h5-vue/dist/vue.runtime.esm.js packages/uni-mp-vue/dist/vue.runtime.esm.js packages/uni-mp-alipay/dist/uni.api.esm.js packages/uni-mp-alipay/dist/uni.mp.esm.js packages/uni-mp-baidu/dist/uni.api.esm.js packages/uni-mp-baidu/dist/uni.mp.esm.js packages/uni-mp-qq/dist/uni.api.esm.js packages/uni-mp-qq/dist/uni.mp.esm.js packages/uni-mp-toutiao/dist/uni.api.esm.js packages/uni-mp-toutiao/dist/uni.mp.esm.js packages/uni-mp-weixin/dist/uni.api.esm.js packages/uni-mp-weixin/dist/uni.mp.esm.js packages/uni-quickapp-webview/dist/uni.api.esm.js packages/uni-quickapp-webview/dist/uni.mp.esm.js

- run: npm run test
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
packages/playground/*/dist
packages/size-check/dist
packages/uni-app-vite/dist
packages/uni-cli-nvue/dist
packages/uni-cli-shared/dist
packages/uni-h5-vite/dist
packages/uni-mp-vite/dist
packages/uni-mp-compiler/dist
packages/uni-nvue-styler/dist
packages/vite-plugin-uni/dist
packages/uts/dist
packages/uni-uts-v1/dist


.DS_Store
node_modules
9 changes: 0 additions & 9 deletions .ls-lint.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
dist
packages/uni-app-plus/lib
packages/uni-app-vite/lib
packages/uni-app-vue/lib
packages/uni-automator/lib
packages/uni-cli-nvue/lib
packages/uni-cli-shared/lib
packages/uni-components/lib
packages/uni-cloud/lib
packages/uni-h5/lib
packages/uni-stat/lib
packages/uni-push/lib
packages/uni-mp-alipay/lib
packages/uni-mp-baidu/lib
packages/uni-mp-kuaishou/lib
@@ -14,4 +17,5 @@ packages/uni-mp-toutiao/lib
packages/uni-mp-vue/lib
packages/uni-mp-weixin/lib
packages/uni-mp-quickapp-webview/lib
packages/vite-plugin-uni/lib
packages/vite-plugin-uni/lib
packages/uni-uts-vite/lib
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}
9 changes: 8 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -4,19 +4,26 @@ module.exports = {
globals: {
__DEV__: true,
__TEST__: true,
__NODE_JS__: true,
__VERSION__: require('./package.json').version,
__BROWSER__: false,
__GLOBAL__: false,
__VUE_OPTIONS_API__: true,
__VUE_PROD_DEVTOOLS__: false,
// source-map
__PLATFORM_WEB__: false,
},
coverageDirectory: 'coverage',
coverageReporters: ['html', 'lcov', 'text'],
collectCoverageFrom: ['packages/*/src/**/*.ts'],
watchPathIgnorePatterns: ['/node_modules/', '/dist/', '/.git/'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'json'],
moduleNameMapper: {
'^@dcloudio/(.*?)$': '<rootDir>/packages/$1/src',
"@dcloudio/uts-darwin-arm64": "<rootDir>/packages/uts-darwin-arm64",
"@dcloudio/uts-darwin-x64": "<rootDir>/packages/uts-darwin-x64",
"@dcloudio/uts-win32-ia32-msvc": "<rootDir>/packages/uts-win32-ia32-msvc",
"@dcloudio/uts-win32-x64-msvc": "<rootDir>/packages/uts-win32-x64-msvc",
'^@dcloudio/(.*?)$': '<rootDir>/packages/$1/src'
},
rootDir: __dirname,
testMatch: ['<rootDir>/packages/**/__tests__/**/*spec.[jt]s?(x)'],
11 changes: 0 additions & 11 deletions lerna.json

This file was deleted.

Loading