【ci】依赖更新；doc 过滤

Author: xiongjiaojiao

build/jsdocs/mapboxgl/docs.json

@@ -65,7 +65,8 @@
             "src/common/security/KeyServiceParameter",
             "src/common/components/templates/TemplateBase",
             "src/mapboxgl/core/Util",
-            "src/mapboxgl/overlay/L7/l7-render"
+            "src/mapboxgl/overlay/L7/l7-render",
+            "src/mapboxgl/mapping/utils"
         ]
     },
     "plugins": ["plugins/markdown","../plugins/usage", "../plugins/moduleCategories"],

build/webpack.config.base.js

@@ -16,12 +16,33 @@ function compareDependencies(pkgName, dependenciesToCompare, rootDependencies =
   });
 }
 
+function checkRootDependencies(dependenciesToCompare, rootDependencies = pkg.dependencies) {
+  const clientDepsList = Object.values(dependenciesToCompare);
+  const clientNames = Object.keys(dependenciesToCompare);
+  Object.keys(rootDependencies).forEach(name => {
+    if (rootDependencies[name].includes('file:src/')){
+      return;
+    }
+    if (!clientDepsList.some(deps => Object.keys(deps).some(item => item === name))) {
+      console.log(chalk.red(`ERROR: The dependency ${name} version can not match in (${clientNames.join('|')}) package.json!\n`));
+    }
+  });
+}
+
 const packageToClients = ['common', 'classic', 'leaflet', 'openlayers', 'mapboxgl', 'maplibregl'];
-packageToClients.forEach(client => {
+
+const clientDepencies = packageToClients.reduce((list, client) => {
   // eslint-disable-next-line import/no-dynamic-require
   const clientPkg = require(`../src/${client}/package.json`);
-  compareDependencies(clientPkg.name, clientPkg.dependencies);
-});
+  list[clientPkg.name] = clientPkg.dependencies;
+  return list;
+}, {});
+
+for (const clientName in clientDepencies) {
+  compareDependencies(clientName, clientDepencies[clientName]);
+}
+
+checkRootDependencies(clientDepencies);
 
 //包版本(ES6或者ES5)
 let moduleVersion = process.env.moduleVersion || 'es5';

package.json

@@ -73,8 +73,11 @@
     "@babel/preset-env": "^7.23.8",
     "@babel/traverse": "^7.23.7",
     "@babel/types": "^7.23.6",
+    "@elastic/elasticsearch": "^5.6.22",
     "@geoman-io/leaflet-geoman-free": "^2.14.2",
+    "@sinonjs/text-encoding": "^0.7.2",
     "@supermap/babel-plugin-import": "^0.0.1",
+    "@tensorflow/tfjs": "^3.9.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "babel-plugin-istanbul": "^6.0.0",
@@ -88,6 +91,7 @@
     "clean-css-cli": "^4.3.0",
     "commander": "^9.0.0",
     "copy-webpack-plugin": "^9.1.0",
+    "core-js": "^3.30.2",
     "cross-env": "^7.0.2",
     "css-loader": "^6.7.1",
     "elasticsearch": "16.7.3",
@@ -116,12 +120,14 @@
     "open": "^8.4.0",
     "pngjs": "^6.0.0",
     "pre-commit": "^1.2.2",
+    "process": "^0.11.10",
     "request": "^2.88.0",
     "selenium-server": "3.141.59",
     "serve-index": "^1.9.1",
     "shelljs": "^0.8.4",
     "style-loader": "^2.0.0",
     "uglify-es": "^3.3.9",
+    "util": "^0.12.4",
     "watchify": "^3.11.1",
     "webpack": "^5.1.3",
     "webpack-cli": "4.2.0",
@@ -131,22 +137,19 @@
   "dependencies": {
     "@antv/g2": "^4.2.11",
     "@antv/g6": "^4.8.14",
-    "@elastic/elasticsearch": "^5.6.22",
     "@mapbox/mapbox-gl-style-spec": "^14.3.0",
     "@mapbox/vector-tile": "1.3.1",
-    "@sinonjs/text-encoding": "^0.7.2",
     "@supermap/iclient-common": "file:src/common",
     "@supermap/tile-decryptor": "^0.0.2",
-    "@tensorflow/tfjs": "^3.9.0",
     "@turf/center": "^6.5.0",
     "@turf/turf": "6.5.0",
     "canvg": "3.0.10",
-    "core-js": "^3.30.2",
     "echarts": "5.4.3",
     "fast-xml-parser": "^4.2.7",
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "flatgeobuf": "3.23.1",
+    "flv.js": "^1.6.2",
     "insert-css": "^2.0.0",
     "jsonsql": "0.2.5",
     "leaflet": "1.9.4",
@@ -161,14 +164,11 @@
     "node-forge": "^1.3.1",
     "ol": "6.14.1",
     "pbf": "3.2.1",
-    "process": "^0.11.10",
     "proj4": "2.9.0",
     "promise-polyfill": "8.2.3",
     "rbush": "^2.0.2",
     "three": "0.150.1",
     "urijs": "^1.19.11",
-    "util": "^0.12.4",
-    "flv.js": "^1.6.2",
     "video.js": "^7.10.2",
     "videojs-flvjs-es6": "^1.0.1",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"

src/common/package.json

@@ -20,6 +20,7 @@
     "fetch-ie8": "1.5.0",
     "fetch-jsonp": "1.1.3",
     "flatgeobuf": "3.23.1",
+    "insert-css": "^2.0.0",
     "promise-polyfill": "8.2.3",
     "lodash.topairs": "4.3.0",
     "lodash.uniqby": "^4.7.0",

src/mapboxgl/package.json

@@ -15,6 +15,9 @@
   "author": "SuperMap",
   "license": "Apache-2.0",
   "dependencies": {
+    "@antv/g2": "^4.2.11",
+    "@mapbox/mapbox-gl-style-spec": "^14.3.0",
+    "@turf/center": "^6.5.0",
     "@turf/turf": "6.5.0",
     "mapv": "2.0.62",
     "mapbox-gl": "1.13.2",