@tarojs/plugin-http 3.7.0-canary.6 → 3.8.0-canary.1

package/LICENSE

@@ -158,3 +158,17 @@ MIT (stencil-vue2-output-target):
 The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
 `/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
 See `/LICENSE` for details of the license.
+
+==================
+
+MIT (weui):
+The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
+`/packages/taro-components/src/components/*.scss`
+See `/LICENSE.txt` for details of the license.
+
+==================
+
+Apache-2.0 (intersection-observer):
+The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
+`/packages/taro-api/src/polyfill/intersection-observer.ts`
+See `/LICENSE.txt` for details of the license.

package/dist/runtime.js

@@ -1,7 +1,7 @@
 import { parseUrl, Events, createEvent, window, document } from '@tarojs/runtime';
 export { document } from '@tarojs/runtime';
-import { isString, isFunction, isWebPlatform } from '@tarojs/shared';
 import { setStorage, getStorageSync, request } from '@tarojs/taro';
+import { isString, isFunction } from '@tarojs/shared';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -17,7 +17,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __classPrivateFieldGet(receiver, state, kind, f) {
@@ -31,7 +31,12 @@ function __classPrivateFieldSet(receiver, state, value, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 var _Cookie_map;
 const STORAGE_KEY = 'PAGE_COOKIE';
@@ -357,20 +362,20 @@ function createXMLHttpRequestEvent(event, target, loaded) {
     const e = createEvent(event);
     try {
         Object.defineProperties(e, {
-            'currentTarget': {
+            currentTarget: {
                 enumerable: true,
                 value: target
             },
-            'target': {
+            target: {
                 enumerable: true,
                 value: target
             },
-            'loaded': {
+            loaded: {
                 enumerable: true,
                 value: loaded || 0
             },
             // 读 Content-Range 字段，目前来说作用不大,先和 loaded 保持一致
-            'total': {
+            total: {
                 enumerable: true,
                 value: loaded || 0
             }
@@ -505,15 +510,17 @@ class XMLHttpRequest extends Events {
         }
     }
     getAllResponseHeaders() {
-        if (__classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.UNSENT || __classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.OPENED || !__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f"))
+        if (__classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.UNSENT || __classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.OPENED || !__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f")) {
             return '';
+        }
         return Object.keys(__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f"))
             .map((key) => `${key}: ${__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f")[key]}`)
             .join('\r\n');
     }
     getResponseHeader(name) {
-        if (__classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.UNSENT || __classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.OPENED || !__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f"))
+        if (__classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.UNSENT || __classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f") === XMLHttpRequest.OPENED || !__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f")) {
             return null;
+        }
         // 处理大小写不敏感
         const key = Object.keys(__classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f")).find((item) => item.toLowerCase() === name.toLowerCase());
         const value = key ? __classPrivateFieldGet(this, _XMLHttpRequest_resHeader, "f")[key] : null;
@@ -580,6 +587,7 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     // 头信息
     const header = Object.assign({}, __classPrivateFieldGet(this, _XMLHttpRequest_header, "f"));
     // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Cookies
+    // @ts-ignore
     header.cookie = window.document.$$cookie;
     if (!this.withCredentials) {
         // 不同源，要求 withCredentials 为 true 才携带 cookie
@@ -648,7 +656,7 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     }
 }, _XMLHttpRequest_requestFail = function _XMLHttpRequest_requestFail(err) {
     // 微信小程序，无论接口返回200还是其他，响应无论是否有错误，都会进入 success 回调；只有类似超时这种请求错误才会进入 fail 回调
-    // 
+    //
     /**
      * 阿里系小程序，接口返回非200状态码，会进入 fail 回调, 此时 err 对象结构如下（当错误码为 14 或 19 时，会多返回 status、data、headers。可通过这些字段获取服务端相关错误信息）：
      {
@@ -690,7 +698,7 @@ XMLHttpRequest.HEADERS_RECEIVED = 2;
 XMLHttpRequest.LOADING = 3;
 XMLHttpRequest.DONE = 4;
 
-if (!isWebPlatform()) {
+if (process.env.TARO_PLATFORM !== 'web') {
     if (ENABLE_COOKIE) {
         const _cookie = createCookieInstance();
         Object.defineProperties(document, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-http",
-  "version": "3.7.0-canary.6",
+  "version": "3.8.0-canary.1",
   "description": "Taro 小程序端支持使用 web 请求 的插件",
   "main": "index.js",
   "files": [
@@ -23,12 +23,12 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@tarojs/runtime": "3.7.0-canary.6",
-    "@tarojs/shared": "3.7.0-canary.6",
-    "@tarojs/service": "3.7.0-canary.6"
+    "@tarojs/runtime": "3.8.0-canary.1",
+    "@tarojs/shared": "3.8.0-canary.1",
+    "@tarojs/service": "3.8.0-canary.1"
   },
   "devDependencies": {
-    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "jest": "^29.3.1",
     "jest-cli": "^29.3.1",
@@ -37,13 +37,13 @@
     "rollup-plugin-node-externals": "^5.0.0",
     "rollup-plugin-ts": "^3.0.2",
     "ts-jest": "^29.0.5",
-    "tslib": "^2.5.0",
+    "tslib": "^2.6.2",
     "typescript": "^4.7.4"
   },
   "scripts": {
     "dev": "rollup -c -w --bundleConfigAsCjs",
     "build": "rollup -c --bundleConfigAsCjs",
     "test": "jest",
-    "test:ci": "jest --ci -i --coverage false"
+    "test:ci": "jest --ci -i --coverage --silent"
   }
 }

package/src/__tests__/cookie.spec.js

@@ -85,5 +85,4 @@ describe('cookie', () => {
     expect(cookie.getCookie(url1)).toBe('aaa=bbb; abc=cba; ggg=hhh; kkk=lll; ooo=ppp')
     expect(cookie.getCookie(url4)).toBe('aaa=bbb; abc=cba; ggg=hhh; kkk=lll; mmm=nnn')
   })
-
 })

package/src/__tests__/dom.spec.js

@@ -3,9 +3,8 @@ describe('DOM', () => {
   const runtime = require('../../dist/runtime')
   const document = runtime.document
   global.document = runtime.document
-  
-  describe('document', () => {
 
+  describe('document', () => {
     it('document setCookie', async () => {
       expect(document.cookie).toBe('')
       document.cookie = 'aaa=1111-2222-33-444-abcdefgasd; path=/; expires=Mon, 18 Jan 2038 19:14:07 GMT; secure;'
@@ -15,6 +14,5 @@ describe('DOM', () => {
         'aaa=1111-2222-33-444-abcdefgasd; bbb=23123-aswe-4a7a-a740-f55dfd296b1d; ccc=69asd3d81234668942'
       )
     })
-    
   })
 })

package/src/runtime/Cookie.ts

@@ -1,5 +1,5 @@
 /******************************************************************************
-Copyright (c) 2019 wechat-miniprogram. 
+Copyright (c) 2019 wechat-miniprogram.
 Reference and modify code  by miniprogram-render/src/bom/cookie.js.
 
 Permission to use, copy, modify, and/or distribute this software for any

package/src/runtime/XMLHttpRequest.ts

@@ -63,27 +63,27 @@ function createXMLHttpRequestEvent (event: string, target:XMLHttpRequest, loaded
   const e = createEvent(event) as XMLHttpRequestEvent
   try {
     Object.defineProperties(e, {
-      'currentTarget': {
+      currentTarget: {
         enumerable: true,
         value: target
       },
-      'target': {
+      target: {
         enumerable: true,
         value: target
       },
-      'loaded': {
+      loaded: {
         enumerable: true,
         value: loaded || 0
       },
       // 读 Content-Range 字段，目前来说作用不大,先和 loaded 保持一致
-      'total': {
+      total: {
         enumerable: true,
         value: loaded || 0
       }
     })
   } catch (err) {
     // no handler
-  } 
+  }
   return e
 }
 
@@ -226,6 +226,7 @@ export class XMLHttpRequest extends Events {
     // 头信息
     const header = Object.assign({}, this.#header)
     // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Cookies
+    // @ts-ignore
     header.cookie = window.document.$$cookie
     if (!this.withCredentials) {
       // 不同源，要求 withCredentials 为 true 才携带 cookie
@@ -314,7 +315,7 @@ export class XMLHttpRequest extends Events {
    */
   #requestFail (err) {
     // 微信小程序，无论接口返回200还是其他，响应无论是否有错误，都会进入 success 回调；只有类似超时这种请求错误才会进入 fail 回调
-    // 
+    //
     /**
      * 阿里系小程序，接口返回非200状态码，会进入 fail 回调, 此时 err 对象结构如下（当错误码为 14 或 19 时，会多返回 status、data、headers。可通过这些字段获取服务端相关错误信息）：
      {
@@ -424,8 +425,7 @@ export class XMLHttpRequest extends Events {
   }
 
   getAllResponseHeaders () {
-    if (this.#readyState === XMLHttpRequest.UNSENT || this.#readyState === XMLHttpRequest.OPENED || !this.#resHeader)
-      return ''
+    if (this.#readyState === XMLHttpRequest.UNSENT || this.#readyState === XMLHttpRequest.OPENED || !this.#resHeader) { return '' }
 
     return Object.keys(this.#resHeader)
       .map((key) => `${key}: ${this.#resHeader![key]}`)
@@ -433,8 +433,7 @@ export class XMLHttpRequest extends Events {
   }
 
   getResponseHeader (name) {
-    if (this.#readyState === XMLHttpRequest.UNSENT || this.#readyState === XMLHttpRequest.OPENED || !this.#resHeader)
-      return null
+    if (this.#readyState === XMLHttpRequest.UNSENT || this.#readyState === XMLHttpRequest.OPENED || !this.#resHeader) { return null }
 
     // 处理大小写不敏感
     const key = Object.keys(this.#resHeader).find((item) => item.toLowerCase() === name.toLowerCase())

package/src/runtime/index.ts

@@ -1,15 +1,14 @@
 import { document, window } from '@tarojs/runtime'
-import { isWebPlatform } from '@tarojs/shared'
 
 import { Cookie, createCookieInstance } from './Cookie'
 import { type XMLHttpRequestEvent, XMLHttpRequest } from './XMLHttpRequest'
 
 declare const ENABLE_COOKIE: boolean
 
-if (!isWebPlatform()) {
+if (process.env.TARO_PLATFORM !== 'web') {
   if (ENABLE_COOKIE) {
     const _cookie = createCookieInstance()
-  
+
     Object.defineProperties(document, {
       URL: {
         get () {