【fix】升级关联插件，尝试修复运行失败的问题。leaflet兼容ie8问题待解决 review by liqian

songyumeng · songyumeng · commit b86f4e4c4e24 · 2019-11-26T22:26:43.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -52,6 +52,8 @@ module.exports = {
         "no-fallthrough": "warn",
         //禁止直接调用eval()
         "no-eval": ["error", {"allowIndirect": true}],
+        "no-prototype-builtins":"off",
+        "no-useless-catch":"off",
         //Ensure imports point to a file/module that can be resolved
         "import/no-unresolved": [2, {commonjs: true, amd: true}],
         //Ensure named imports correspond to a named export in the remote file
diff --git a/build/webpack.config.classic.js b/build/webpack.config.classic.js
@@ -33,7 +33,7 @@ module.exports = {
                     test: /\.js/,
                     loader: 'babel-loader',
                     query: {
-                        presets: ['es2015']
+                        presets: ['@babel/preset-env']
                     }
                 });
 
diff --git a/build/webpack.config.leaflet.js b/build/webpack.config.leaflet.js
@@ -39,15 +39,15 @@ module.exports = {
                     exclude: /setImmediate|webgl-debug/,
                     loader: 'babel-loader',
                     options: {
-                        presets: ['es2015']
+                        presets: ['@babel/preset-env']
                     }
                 });
                 //兼容es3相关配置
-                moduleRules.push({
-                    test: /\.js$/,
-                    enforce: "post",
-                    loaders: ['es3ify-loader']
-                });
+                // moduleRules.push({
+                //     test: /\.js$/,
+                //     enforce: "post",
+                //     loaders: ['es3ify-loader']
+                // });
             }
             moduleRules.push(configBase.module.rules.css);
             return moduleRules
diff --git a/build/webpack.config.mapboxgl.js b/build/webpack.config.mapboxgl.js
@@ -43,7 +43,7 @@ module.exports = {
           exclude: /node_modules[\/\\]proj4|classic|webgl-debug/,
           loader: 'babel-loader',
           options: {
-            presets: ['es2015']
+            presets: ['@babel/preset-env']
           }
         });
       }
diff --git a/build/webpack.config.openlayers.js b/build/webpack.config.openlayers.js
@@ -42,7 +42,7 @@ module.exports = {
                     exclude: /classic | webgl-debug/,
                     loader: 'babel-loader',
                     options: {
-                        presets: ['env']
+                        presets: ['@babel/preset-env']
                     }
                 });
 
diff --git a/package.json b/package.json
@@ -55,59 +55,58 @@
   "author": "SuperMap_FE",
   "license": "Apache-2.0",
   "devDependencies": {
-    "babel-core": "^6.26.0",
+    "@babel/core": "^7.7.4",
+    "@babel/preset-env": "^7.7.4",
     "babel-eslint": "^10.0.3",
-    "babel-loader": "^7.1.4",
+    "babel-loader": "^8.0.6",
     "babel-plugin-istanbul": "^5.2.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-es2015": "^6.24.1",
-    "babelify": "^7.3.0",
-    "browserify": "^14.3.0",
-    "browserify-css": "^0.11.1",
+    "babelify": "^10.0.0",
+    "browserify": "^16.5.0",
+    "browserify-css": "^0.15.0",
     "browserify-imgify": "^0.0.1",
     "chromedriver": "75.1.0",
-    "clean-css-cli": "^4.1.6",
+    "clean-css-cli": "^4.3.0",
     "commander": "^4.0.1",
     "cross-env": "^6.0.3",
     "css-loader": "^3.2.0",
     "es3ify-loader": "^0.2.0",
-    "eslint": "^4.6.1",
-    "eslint-loader": "^2.0.0",
-    "eslint-plugin-import": "^2.8.0",
+    "eslint": "^6.7.1",
+    "eslint-loader": "^3.0.2",
+    "eslint-plugin-import": "^2.18.2",
     "express": "^4.16.3",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "file-loader": "^4.2.0",
+    "file-loader": "^5.0.2",
     "get-pixels": "^3.3.0",
-    "image-size": "^0.8.3",
+    "image-size": "^0.6.1",
     "imports-loader": "^0.8.0",
     "istanbul": "^0.4.5",
-    "jasmine-core": "^2.5.2",
-    "jsdoc": "^3.5.5",
+    "jasmine-core": "^3.5.0",
+    "jsdoc": "^3.6.3",
     "karma": "^4.4.1",
     "karma-browserify": "^6.1.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-cli": "^1.0.1",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-cli": "^2.0.0",
     "karma-coverage": "^2.0.1",
     "karma-jasmine": "^2.0.1",
-    "karma-teamcity-reporter": "^1.0.0",
+    "karma-teamcity-reporter": "^1.1.0",
     "leaflet.pm": "^0.25.0",
     "mock-socket": "^9.0.2",
-    "nightwatch": "^0.9.5",
-    "open": "^6.0.0",
-    "pngjs": "^3.3.0",
+    "nightwatch": "^1.3.1",
+    "open": "^7.0.0",
+    "pngjs": "^3.4.0",
     "pre-commit": "^1.2.2",
-    "request": "^2.83.0",
+    "request": "^2.88.0",
     "selenium-server": "3.141.59",
     "serve-index": "^1.9.1",
-    "shelljs": "^0.7.6",
-    "style-loader": "^0.13.1",
+    "shelljs": "^0.8.3",
+    "style-loader": "^1.0.0",
     "uglify-es": "^3.3.9",
     "url-loader": "^2.3.0",
-    "watchify": "^3.9.0",
-    "webpack": "4.41.2",
-    "webpack-cli": "3.3.10",
-    "webpack-dev-middleware": "^3.2.0",
-    "webpack-node-externals": "^1.6.0"
+    "watchify": "^3.11.1",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-node-externals": "^1.7.2"
   },
   "dependencies": {
     "@mapbox/vector-tile": "1.3.0",
diff --git a/src/common/commontypes/Events.js b/src/common/commontypes/Events.js
@@ -414,7 +414,7 @@ export class Events {
             // bind the context to callback.obj
             continueChain = callback.func.apply(callback.obj, [evt]);
 
-            if ((continueChain != undefined) && (continueChain == false)) {
+            if ((continueChain != undefined) && (continueChain === false)) {
                 // if callback returns false, execute no more callbacks.
                 break;
             }
diff --git a/src/common/format/GeoJSON.js b/src/common/format/GeoJSON.js
@@ -83,7 +83,7 @@ export class GeoJSON extends JSONFormat {
              * @returns {SuperMap.Geometry} 一个几何对象。
              */
             "point": function (array) {
-                if (this.ignoreExtraDims == false &&
+                if (this.ignoreExtraDims === false &&
                     array.length != 2) {
                     throw "Only 2D points are supported: " + array;
                 }
diff --git a/src/common/iPortal/iPortalQueryResult.js b/src/common/iPortal/iPortalQueryResult.js
@@ -14,7 +14,6 @@ import {Util} from '../commontypes/Util';
  */
 export class IPortalQueryResult {
     constructor(mapUrl, params) {
-        super(mapUrl);
         params = params || {};
         this.authorizeSetting = [];
         this.center = "";
diff --git a/src/common/iPortal/iPortalResource.js b/src/common/iPortal/iPortalResource.js
@@ -95,5 +95,5 @@ export class IPortalResource extends IPortalServiceBase {
 
 }
 
-SuperMap.iPortalMap = IPortalMap;
+SuperMap.iPortalMap = IPortalResource;
 
diff --git a/src/common/iServer/ComputeWeightMatrixService.js b/src/common/iServer/ComputeWeightMatrixService.js
@@ -89,7 +89,7 @@ export class ComputeWeightMatrixService extends NetworkAnalystServiceBase {
                 }
                 jsonString += '{"x":' + params[i].x + ',"y":' + params[i].y + '}';
             }
-        } else if (isAnalyzeById == true) {
+        } else if (isAnalyzeById === true) {
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
                     jsonString += ",";
diff --git a/src/common/iServer/FindClosestFacilitiesService.js b/src/common/iServer/FindClosestFacilitiesService.js
@@ -103,7 +103,7 @@ export class FindClosestFacilitiesService extends NetworkAnalystServiceBase {
                 }
                 jsonString += '{"x":' + params[i].x + ',"y":' + params[i].y + '}';
             }
-        } else if (isAnalyzeById == true) {
+        } else if (isAnalyzeById === true) {
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
                     jsonString += ",";
diff --git a/src/common/iServer/FindMTSPPathsService.js b/src/common/iServer/FindMTSPPathsService.js
@@ -95,7 +95,7 @@ export class FindMTSPPathsService extends NetworkAnalystServiceBase {
                 }
                 jsonString += '{"x":' + params[i].x + ',"y":' + params[i].y + '}';
             }
-        } else if (isAnalyzeById == true) {
+        } else if (isAnalyzeById === true) {
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
                     jsonString += ",";
diff --git a/src/common/iServer/FindPathService.js b/src/common/iServer/FindPathService.js
@@ -91,7 +91,7 @@ export class FindPathService extends NetworkAnalystServiceBase {
                 }
                 jsonString += '{"x":' + params[i].x + ',"y":' + params[i].y + '}';
             }
-        } else if (isAnalyzeById == true) {
+        } else if (isAnalyzeById === true) {
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
                     jsonString += ",";
diff --git a/src/common/iServer/FindServiceAreasService.js b/src/common/iServer/FindServiceAreasService.js
@@ -93,7 +93,7 @@ export class FindServiceAreasService extends NetworkAnalystServiceBase {
                 }
                 jsonString += '{"x":' + params[i].x + ',"y":' + params[i].y + '}';
             }
-        } else if (isAnalyzeById == true) {
+        } else if (isAnalyzeById === true) {
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
                     jsonString += ",";
diff --git a/src/common/iServer/FindTSPPathsService.js b/src/common/iServer/FindTSPPathsService.js
@@ -91,7 +91,7 @@ export class FindTSPPathsService extends NetworkAnalystServiceBase {
             }
             nodesString += ']';
             jsonParameters += nodesString;
-        } else if (params.isAnalyzeById == true) {
+        } else if (params.isAnalyzeById === true) {
             let nodeIDsString = "[", nodes = params.nodes, len = nodes.length;
             for (let i = 0; i < len; i++) {
                 if (i > 0) {
diff --git a/src/openlayers/mapping/ImageSuperMapRest.js b/src/openlayers/mapping/ImageSuperMapRest.js
diff --git a/test/karma.conf.js b/test/karma.conf.js

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ module.exports = {`
`33`	`33`	`test: /\.js/,`
`34`	`34`	`loader: 'babel-loader',`
`35`	`35`	`query: {`
`36`		`- presets: ['es2015']`
	`36`	`+ presets: ['@babel/preset-env']`
`37`	`37`	`}`
`38`	`38`	`});`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ module.exports = {`
`43`	`43`	`exclude: /node_modules[\/\\]proj4\|classic\|webgl-debug/,`
`44`	`44`	`loader: 'babel-loader',`
`45`	`45`	`options: {`
`46`		`- presets: ['es2015']`
	`46`	`+ presets: ['@babel/preset-env']`
`47`	`47`	`}`
`48`	`48`	`});`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ module.exports = {`
`42`	`42`	`exclude: /classic \| webgl-debug/,`
`43`	`43`	`loader: 'babel-loader',`
`44`	`44`	`options: {`
`45`		`- presets: ['env']`
	`45`	`+ presets: ['@babel/preset-env']`
`46`	`46`	`}`
`47`	`47`	`});`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ export class Events {`
`414`	`414`	`// bind the context to callback.obj`
`415`	`415`	`continueChain = callback.func.apply(callback.obj, [evt]);`
`416`	`416`
`417`		`- if ((continueChain != undefined) && (continueChain == false)) {`
	`417`	`+ if ((continueChain != undefined) && (continueChain === false)) {`
`418`	`418`	`// if callback returns false, execute no more callbacks.`
`419`	`419`	`break;`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export class GeoJSON extends JSONFormat {`
`83`	`83`	`* @returns {SuperMap.Geometry} 一个几何对象。`
`84`	`84`	`*/`
`85`	`85`	`"point": function (array) {`
`86`		`- if (this.ignoreExtraDims == false &&`
	`86`	`+ if (this.ignoreExtraDims === false &&`
`87`	`87`	`array.length != 2) {`
`88`	`88`	`throw "Only 2D points are supported: " + array;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,5 +95,5 @@ export class IPortalResource extends IPortalServiceBase {`
`95`	`95`
`96`	`96`	`}`
`97`	`97`
`98`		`-SuperMap.iPortalMap = IPortalMap;`
	`98`	`+SuperMap.iPortalMap = IPortalResource;`
`99`	`99`