From b622147f19ce450dec6b28b176e200bc7a04ce42 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 12 May 2021 14:28:04 +0800
Subject: [PATCH] chore(e2e): add windows

---
 .github/workflows/e2e.yml          |  2 ++
 packages/uni-h5/dist/uni-h5.cjs.js | 23 +++++++++++++++++++++--
 packages/uni-h5/vite.config.ts     |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index bd4e4ea59..cbbc48e5b 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -16,6 +16,8 @@ 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:
diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js
index 4d70c4bfd..ab4092fd6 100644
--- a/packages/uni-h5/dist/uni-h5.cjs.js
+++ b/packages/uni-h5/dist/uni-h5.cjs.js
@@ -1,4 +1,20 @@
 "use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, {enumerable: true, configurable: true, writable: true, value}) : obj[key] = value;
+var __spreadValues = (a2, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a2, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a2, prop, b[prop]);
+    }
+  return a2;
+};
 Object.defineProperty(exports, "__esModule", {value: true});
 exports[Symbol.toStringTag] = "Module";
 var shared = require("@vue/shared");
@@ -2197,7 +2213,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock("uni-canvas", vue.mergeProps({
     "canvas-id": $props.canvasId,
     "disable-scroll": $props.disableScroll
-  }, {...$setup.Attrs, ...$setup.ExcludeAttrs}, vue.toHandlers($options._listeners)), [
+  }, __spreadValues(__spreadValues({}, $setup.Attrs), $setup.ExcludeAttrs), vue.toHandlers($options._listeners)), [
     vue.createVNode("canvas", _hoisted_1$5, null, 512),
     vue.createVNode("div", _hoisted_2$2, [
       vue.renderSlot(_ctx.$slots, "default")
@@ -4691,7 +4707,10 @@ var index$e = /* @__PURE__ */ vue.defineComponent({
 });
 function useProvideRadioGroup(props2, trigger) {
   const fields = [];
-  const getFieldsValue = () => fields.find((field) => field.value.radioChecked)?.value.value;
+  const getFieldsValue = () => {
+    var _a;
+    return (_a = fields.find((field) => field.value.radioChecked)) == null ? void 0 : _a.value.value;
+  };
   vue.provide(uniRadioGroupKey, {
     addField(field) {
       fields.push(field);
diff --git a/packages/uni-h5/vite.config.ts b/packages/uni-h5/vite.config.ts
index 4318ebb58..74aac2150 100644
--- a/packages/uni-h5/vite.config.ts
+++ b/packages/uni-h5/vite.config.ts
@@ -94,7 +94,7 @@ export default defineConfig({
     vueJsx({ optimize: true, isCustomElement }),
   ],
   build: {
-    target: 'es2020', // keep import.meta...
+    target: FORMAT === 'cjs' ? 'modules' : 'es2020', // keep import.meta...
     emptyOutDir: FORMAT === 'es',
     minify: false,
     lib: {
-- 
GitLab