@tarojs/plugin-http 3.6.6-alpha.1 → 3.6.6

package/dist/index.js

@@ -26,6 +26,21 @@ var index = (ctx, options) => {
                 ((_b = options.disabledBlob) !== null && _b !== void 0 ? _b : true) && ((_d = args[0]).Blob || (_d.Blob = [runtimeAlias, 'Blob']));
                 return args;
             });
+            if (ctx.initialConfig.compiler === 'webpack4' || (shared.isObject(ctx.initialConfig.compiler) && ctx.initialConfig.compiler.type === 'webpack4')) {
+                // taro webpack4 中, 未正确识别到 axios package.json 中的 browser 字段, 以致于打包进入了 node 相关的代码（https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/package.json#L128-L132）
+                const inAxiosReg = /(\/|\\)(node_modules)(\/|\\)(axios)(\/|\\)/;
+                chain.merge({
+                    externals: [
+                        (context, request, callback) => {
+                            if (inAxiosReg.test(context) && request.includes('http.js')) {
+                                // 将 http 适配器从源码里干掉 https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/lib/adapters/adapters.js#L2
+                                return callback(null, 'var undefined');
+                            }
+                            callback();
+                        }
+                    ]
+                });
+            }
         }
     });
     ctx.registerMethod({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-http",
-  "version": "3.6.6-alpha.1",
+  "version": "3.6.6",
   "description": "Taro 小程序端支持使用 web 请求 的插件",
   "main": "index.js",
   "files": [
@@ -23,9 +23,9 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@tarojs/runtime": "3.6.6-alpha.1",
-    "@tarojs/service": "3.6.6-alpha.1",
-    "@tarojs/shared": "3.6.6-alpha.1"
+    "@tarojs/runtime": "3.6.6",
+    "@tarojs/service": "3.6.6",
+    "@tarojs/shared": "3.6.6"
   },
   "devDependencies": {
     "@rollup/plugin-json": "^4.1.0",

package/src/index.ts

@@ -1,4 +1,4 @@
-import { isArray, isString } from '@tarojs/shared'
+import { isArray, isObject, isString } from '@tarojs/shared'
 import path from 'path'
 
 import { name as packageName } from '../package.json'
@@ -35,6 +35,22 @@ export default (ctx: IPluginContext, options: IOptions) => {
 
         return args
       })
+
+      if (ctx.initialConfig.compiler === 'webpack4' || (isObject<boolean>(ctx.initialConfig.compiler) && ctx.initialConfig.compiler.type === 'webpack4')) {
+        // taro webpack4 中, 未正确识别到 axios package.json 中的 browser 字段, 以致于打包进入了 node 相关的代码（https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/package.json#L128-L132）
+        const inAxiosReg = /(\/|\\)(node_modules)(\/|\\)(axios)(\/|\\)/
+        chain.merge({
+          externals: [
+            (context, request, callback) => {
+              if (inAxiosReg.test(context) && request.includes('http.js')) {
+                // 将 http 适配器从源码里干掉 https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/lib/adapters/adapters.js#L2
+                return callback(null, 'var undefined')
+              }
+              callback()
+            }
+          ]
+        })
+      }
     }
   })