@tarojs/plugin-http 3.6.2-canary.1 → 3.6.2-canary.2

package/dist/index.d.ts

@@ -8,4 +8,4 @@ interface IOptions {
     disabledBlob?: boolean;
 }
 declare const _default: (ctx: IPluginContext, options: IOptions) => void;
-export { _default as default };
+export { _default as default, IOptions };

package/dist/index.js

@@ -3,33 +3,35 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@tarojs/shared');
-var path = require('path');
+var path = require('node:path');
 
 var name = "@tarojs/plugin-http";
 
 var index = (ctx, options) => {
-    if (!['h5', 'rn'].includes(ctx.runOpts.options.platform)) {
-        ctx.modifyWebpackChain(({ chain }) => {
+    ctx.modifyWebpackChain(({ chain }) => {
+        if (process.env.TARO_PLATFORM === 'mini') {
             chain.plugin('definePlugin').tap((args) => {
                 var _a;
                 args[0].ENABLE_COOKIE = (_a = options.enableCookie) !== null && _a !== void 0 ? _a : false;
                 return args;
             });
-            const runtimeAlia = `${name}/dist/runtime`;
-            chain.resolve.alias.set(runtimeAlia, path.join(__dirname, 'runtime.js'));
+            const runtimeAlias = `${name}/dist/runtime`;
+            chain.resolve.alias.set(runtimeAlias, path.join(__dirname, 'runtime.js'));
             // 注入相关全局BOM对象
             chain.plugin('providerPlugin').tap((args) => {
                 var _a, _b;
                 var _c, _d;
-                args[0].XMLHttpRequest = [runtimeAlia, 'XMLHttpRequest'];
-                ((_a = options.disabledFormData) !== null && _a !== void 0 ? _a : true) && ((_c = args[0]).FormData || (_c.FormData = [runtimeAlia, 'FormData']));
-                ((_b = options.disabledBlob) !== null && _b !== void 0 ? _b : true) && ((_d = args[0]).Blob || (_d.Blob = [runtimeAlia, 'Blob']));
+                args[0].XMLHttpRequest = [runtimeAlias, 'XMLHttpRequest'];
+                ((_a = options.disabledFormData) !== null && _a !== void 0 ? _a : true) && ((_c = args[0]).FormData || (_c.FormData = [runtimeAlias, 'FormData']));
+                ((_b = options.disabledBlob) !== null && _b !== void 0 ? _b : true) && ((_d = args[0]).Blob || (_d.Blob = [runtimeAlias, 'Blob']));
                 return args;
             });
-        });
-        ctx.registerMethod({
-            name: 'onSetupClose',
-            fn(platform) {
+        }
+    });
+    ctx.registerMethod({
+        name: 'onSetupClose',
+        fn(platform) {
+            if (process.env.TARO_PLATFORM === 'mini') {
                 const injectedPath = `post:${name}/dist/runtime`;
                 if (shared.isArray(platform.runtimePath)) {
                     platform.runtimePath.push(injectedPath);
@@ -37,9 +39,9 @@ var index = (ctx, options) => {
                 else if (shared.isString(platform.runtimePath)) {
                     platform.runtimePath = [platform.runtimePath, injectedPath];
                 }
-            },
-        });
-    }
+            }
+        },
+    });
 };
 
 exports.default = index;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-http",
-  "version": "3.6.2-canary.1",
+  "version": "3.6.2-canary.2",
   "description": "Taro 小程序端支持使用 web 请求 的插件",
   "main": "index.js",
   "files": [
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@tarojs/service": "3.6.2-canary.1",
-    "@tarojs/shared": "3.6.2-canary.1",
-    "@tarojs/runtime": "3.6.2-canary.1"
+    "@tarojs/runtime": "3.6.2-canary.2",
+    "@tarojs/service": "3.6.2-canary.2",
+    "@tarojs/shared": "3.6.2-canary.2"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^4.1.0",
@@ -36,7 +36,7 @@
     "rollup": "^3.8.1",
     "ts-jest": "^29.0.5",
     "tslib": "^2.4.0",
-    "rollup-plugin-node-externals": "^4.0.0",
+    "rollup-plugin-node-externals": "^5.0.0",
     "rollup-plugin-ts": "^3.0.2",
     "typescript": "^4.7.4"
   },

package/src/index.ts

@@ -5,7 +5,7 @@ import { name as packageName } from '../package.json'
 
 import type { IPluginContext, TaroPlatformBase } from '@tarojs/service'
 
-interface IOptions {
+export interface IOptions {
   /** 支持 document.cookie 和 http 设置 cookie (默认false) */
   enableCookie?: boolean
   /** 禁用掉 FormData 全局对象 (默认true禁用) */
@@ -15,38 +15,40 @@ interface IOptions {
 }
 
 export default (ctx: IPluginContext, options: IOptions) => {
-  if (!['h5', 'rn'].includes(ctx.runOpts.options.platform)) {
-    ctx.modifyWebpackChain(({ chain }) => {
+  ctx.modifyWebpackChain(({ chain }) => {
+    if (process.env.TARO_PLATFORM === 'mini') {
       chain.plugin('definePlugin').tap((args) => {
         args[0].ENABLE_COOKIE = options.enableCookie ?? false
         return args
       })
 
-      const runtimeAlia = `${packageName}/dist/runtime`
-      chain.resolve.alias.set(runtimeAlia, path.join(__dirname, 'runtime.js'))
+      const runtimeAlias = `${packageName}/dist/runtime`
+      chain.resolve.alias.set(runtimeAlias, path.join(__dirname, 'runtime.js'))
       // 注入相关全局BOM对象
       chain.plugin('providerPlugin').tap((args) => {
-        args[0].XMLHttpRequest = [runtimeAlia, 'XMLHttpRequest']
+        args[0].XMLHttpRequest = [runtimeAlias, 'XMLHttpRequest']
 
         // 实际上本runtime 没有实现 FormData 和 Blob 对象， 所以第三方库中的这2个对象会被替换成 undefined
         // （axios这类请求库用到了这2个对象，所以要么实现它要么把它替换掉, 这里我们选择把它替换掉，这样可以确保除了上传以外的功能可以继续使用）
-        ;(options.disabledFormData ?? true) && (args[0].FormData ||= [runtimeAlia, 'FormData'])
-        ;(options.disabledBlob ?? true) && (args[0].Blob ||= [runtimeAlia, 'Blob'])
+        ;(options.disabledFormData ?? true) && (args[0].FormData ||= [runtimeAlias, 'FormData'])
+        ;(options.disabledBlob ?? true) && (args[0].Blob ||= [runtimeAlias, 'Blob'])
 
         return args
       })
-    })
+    }
+  })
 
-    ctx.registerMethod({
-      name: 'onSetupClose',
-      fn (platform: TaroPlatformBase) {
+  ctx.registerMethod({
+    name: 'onSetupClose',
+    fn (platform: TaroPlatformBase) {
+      if (process.env.TARO_PLATFORM === 'mini') {
         const injectedPath = `post:${packageName}/dist/runtime`
         if (isArray(platform.runtimePath)) {
           platform.runtimePath.push(injectedPath)
         } else if (isString(platform.runtimePath)) {
           platform.runtimePath = [platform.runtimePath, injectedPath]
         }
-      },
-    })
-  }
+      }
+    },
+  })
 }

package/src/runtime/XMLHttpRequest.ts

@@ -221,31 +221,31 @@ export class XMLHttpRequest extends Events {
     if (ENABLE_COOKIE) {
       // 处理 set-cookie
       const setCookieStr = header['Set-Cookie']
-  
+
       if (setCookieStr && typeof setCookieStr === 'string') {
         let start = 0
         let startSplit = 0
         let nextSplit = setCookieStr.indexOf(',', startSplit)
         const cookies: string[] = []
-  
+
         while (nextSplit >= 0) {
           const lastSplitStr = setCookieStr.substring(start, nextSplit)
           const splitStr = setCookieStr.substr(nextSplit)
-  
+
           // eslint-disable-next-line no-control-regex
           if (/^,\s*([^,=;\x00-\x1F]+)=([^;\n\r\0\x00-\x1F]*).*/.test(splitStr)) {
             // 分割成功，则上一片是完整 cookie
             cookies.push(lastSplitStr)
             start = nextSplit + 1
           }
-  
+
           startSplit = nextSplit + 1
           nextSplit = setCookieStr.indexOf(',', startSplit)
         }
-  
+
         // 塞入最后一片 cookie
         cookies.push(setCookieStr.substr(start))
-  
+
         cookies.forEach((cookie) => {
           window.document.cookie = cookie
         })