marsprj
diff --git a/‎build/webpack.config.base.js
Lines changed: 12 additions & 2 deletions b/‎build/webpack.config.base.js
Lines changed: 12 additions & 2 deletions
diff --git a/‎package.json
Lines changed: 3 additions & 1 deletion b/‎package.json
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/common/package.json
Lines changed: 1 addition & 1 deletion b/‎src/common/package.json
Lines changed: 1 addition & 1 deletion
@@ -56,13 +56,23 @@ module.exports = {
 
     //其它解决方案配置
     resolve: {
-        extensions: ['.js', '.json', '.css']
+        extensions: ['.js', '.json', '.css'],
+        mainFields: ['browser', 'main'],
+        fallback: {
+          fs: false,
+          http: require.resolve('stream-http'),
+          https: require.resolve('https-browserify'),
+          os: require.resolve('os-browserify/browser'),
+          stream: require.resolve('stream-browserify'),
+          tty: require.resolve('tty-browserify'),
+          zlib: require.resolve('browserify-zlib')
+        }
     },
 
     externals: {
         echarts: 'function(){try{return echarts}catch(e){return {}}}()',
         mapv: 'function(){try{return mapv}catch(e){return {}}}()',
-        elasticsearch: 'function(){try{return elasticsearch}catch(e){return {}}}()',
+        '@elastic/elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
         '@tensorflow/tfjs': 'function(){try{return tf}catch(e){return {}}}()'
     },
 
 
@@ -77,6 +77,7 @@
     "cross-env": "^7.0.2",
     "css-loader": "^6.7.1",
     "es3ify-loader": "^0.2.0",
+    "elasticsearch": "16.7.3",
     "eslint": "^7.11.0",
     "eslint-plugin-import": "^2.22.1",
     "eslint-webpack-plugin": "^2.1.0",
@@ -113,13 +114,13 @@
     "webpack-node-externals": "^2.5.2"
   },
   "dependencies": {
+    "@elastic/elasticsearch": "^5.6.22",
     "@mapbox/vector-tile": "1.3.1",
     "@supermap/iclient-common": "file:src/common",
     "@tensorflow/tfjs": "^3.9.0",
     "@turf/turf": "6.5.0",
     "canvg": "3.0.7",
     "echarts": "4.9.0",
-    "elasticsearch": "16.7.3",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "jsonsql": "0.2.5",
@@ -133,6 +134,7 @@
     "proj4": "2.8.0",
     "promise-polyfill": "8.2.3",
     "three": "0.129.0",
+    "util": "^0.12.4",
     "xlsx": "0.18.5",
     "xml-js": "1.6.11"
   },
 
@@ -14,7 +14,7 @@
   "author": "SuperMap",
   "license": "Apache-2.0",
   "dependencies": {
-    "elasticsearch": "16.7.3",
+    "@elastic/elasticsearch": "^5.6.22",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "promise-polyfill": "8.2.3",