diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index c237a80f56abf57e68cd2d51a9a4d25c1f6e9340..240b977d1b3d97e6bcd3fadfea8fd48c57824824 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -16,8 +16,6 @@ jobs: include: - os: macos-latest node_version: 12 - - os: windows-latest - node_version: 12 fail-fast: false name: 'e2e: node-${{ matrix.node_version }}, ${{ matrix.os }}' steps: @@ -37,7 +35,7 @@ jobs: uses: actions/cache@v2 with: path: | - ~/cache + ~/.cache ${{ steps.yarn-cache.outputs.dir }} key: ${{ runner.os }}-node${{ matrix.node_version }}-${{ hashFiles('yarn.lock') }} restore-keys: | diff --git a/.github/workflows/size-check.yml b/.github/workflows/size-check.yml index 87fe4094814a0bd05995778a1be8defcd87ee3dd..9988fd838e1bfd2983db7d878abe500c1d3bdfd6 100644 --- a/.github/workflows/size-check.yml +++ b/.github/workflows/size-check.yml @@ -12,35 +12,11 @@ jobs: env: CI_JOB_NUMBER: 1 steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set node version to 12 - uses: actions/setup-node@v2 - with: - node-version: 12 - - - name: Get yarn cache directory - id: yarn-cache - run: echo "::set-output name=dir::$(yarn cache dir)" - - - name: Set dependencies cache - uses: actions/cache@v2 - with: - path: | - ~/cache - ${{ steps.yarn-cache.outputs.dir }} - key: ${{ runner.os }}-node12-${{ hashFiles('yarn.lock') }} - restore-keys: ${{ runner.os }}-node12-${{ hashFiles('yarn.lock') }} - - - name: Versions - run: yarn versions - - - name: Install dependencies - run: yarn install --frozen-lockfile - + - uses: actions/checkout@v1 + - uses: bahmutov/npm-install@v1 - uses: fxy060608/size-check-action@v1.1.3 with: github_token: ${{ secrets.GITHUB_TOKEN }} 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 diff --git a/packages/playground/ssr/src/components/ssr-match-media/ssr-match-media.vue b/packages/playground/ssr/src/components/ssr-match-media/ssr-match-media.vue new file mode 100644 index 0000000000000000000000000000000000000000..2b11508dada425205e1785c10ee9b7418ed7a3a4 --- /dev/null +++ b/packages/playground/ssr/src/components/ssr-match-media/ssr-match-media.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/packages/playground/ssr/src/components/ssr-movable-area/ssr-movable-area.vue b/packages/playground/ssr/src/components/ssr-movable-area/ssr-movable-area.vue new file mode 100644 index 0000000000000000000000000000000000000000..143c220d58da6e836f918c5d933ea9d756780442 --- /dev/null +++ b/packages/playground/ssr/src/components/ssr-movable-area/ssr-movable-area.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/packages/playground/ssr/src/main.js b/packages/playground/ssr/src/main.js index 12caadbd3858cc8d87e4671029a55198f0c7c50f..f52a089d88e48aac45fa638150d90f8646581ddc 100644 --- a/packages/playground/ssr/src/main.js +++ b/packages/playground/ssr/src/main.js @@ -5,7 +5,7 @@ export function createApp() { // `trace` 是组件的继承关系追踪 app.config.warnHandler = function (msg) { const ssrLogElem = document.getElementById('ssr-log') - ssrLogElem.innerHTML = ssrLogElem.innerHTML + '\n' + msg + ssrLogElem && (ssrLogElem.innerHTML = ssrLogElem.innerHTML + '\n' + msg) } return { app, diff --git a/packages/playground/ssr/src/pages/index/index.vue b/packages/playground/ssr/src/pages/index/index.vue index f9e70e8cb80c5450de35ea1a255b9dc4368aeb2d..870ce9ce7460fe7df2a7c1263edb888471387890 100644 --- a/packages/playground/ssr/src/pages/index/index.vue +++ b/packages/playground/ssr/src/pages/index/index.vue @@ -1,6 +1,8 @@