Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: chenguanglin

.eslintrc.js

@@ -21,7 +21,7 @@ module.exports = {
         //禁止不必要的分号
         "no-extra-semi": "warn",
         //强制使用一致的换行风格
-        "linebreak-style": ["warn", "windows"],
+        "linebreak-style": "off",
         //if while function 后面的{必须与if在同一行，java风格。
         "brace-style": ["warn", "1tbs", {"allowSingleLine": true}],
         //数组和对象键值对最后一个逗号， never参数：不能带末尾的逗号
@@ -85,4 +85,4 @@ module.exports = {
 
 
     },
-};
+};

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "three"

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - help wanted
+  - bug
+  - enhancement
+  - feature
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/linter.yml

@@ -40,4 +40,7 @@ jobs:
         VALIDATE_ALL_CODEBASE: false
         PATH_REGEX_INCLUDE: src
         DEFAULT_BRANCH: master
+        LINTER_RULES_PATH: ./
         JAVASCRIPT_ES_CONFIG_FILE: .eslintrc.js
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        VALIDATE_JAVASCRIPT_ES: true

build/server.js

@@ -21,7 +21,7 @@ if (product) {
     }
     config.mode = 'development';
     config.entry = entry;
-    config.devtool = 'cheap-module-eval-source-map';
+    config.devtool = 'inline-cheap-module-source-map';
 
     const compiler = webpack(config);
     const instance = webpackDevMiddleware(compiler, {

build/webpack.config.base.js

@@ -1,16 +1,16 @@
-var webpack = require('webpack');
-var ExtractTextPlugin = require('extract-text-webpack-plugin');
+const webpack = require('webpack');
+const MiniCssExtractPlugin  = require('mini-css-extract-plugin');
+const ESLintPlugin = require('eslint-webpack-plugin');
 const pkg = require('../package.json');
 
 //包版本(ES6或者ES5)
-let moduleVersion = process.env.moduleVersion || "es5";
+let moduleVersion = process.env.moduleVersion || 'es5';
 
 //打包公共配置
 module.exports = {
-
     moduleVersion: moduleVersion,
 
-    mode: "production",
+    mode: 'production',
     //页面入口文件配置
     entry: {},
 
@@ -19,12 +19,13 @@ module.exports = {
         return {
             path: `${__dirname}/../dist/${libName}/`,
             filename: `${fileName}.js`
-        }
+        };
     },
 
     //是否启用压缩
     optimization: {
-        minimize: false
+        minimize: false,
+        emitOnErrors: false
     },
     //不显示打包文件大小相关警告
     performance: {
@@ -37,46 +38,32 @@ module.exports = {
     },
 
     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 {}}}()'
+        echarts: 'function(){try{return echarts}catch(e){return {}}}()',
+        mapv: 'function(){try{return mapv}catch(e){return {}}}()',
+        elasticsearch: 'function(){try{return elasticsearch}catch(e){return {}}}()'
     },
 
     module: {
         rules: {
             img: {
                 //图片小于80k采用base64编码
                 test: /\.(png|jpg|jpeg|gif|woff|woff2|svg|eot|ttf)$/,
-                use: [{
-                    loader: 'url-loader',
-                    options: {
-                        limit: 150000
+                use: [
+                    {
+                        loader: 'url-loader',
+                        options: {
+                            limit: 150000
+                        }
                     }
-                }]
-            },
-
-            eslint: {
-                test: [/\.js$/],
-                exclude: /node_modules/,
-                enforce: 'pre',
-                loader: 'eslint-loader',
-                options: {
-                    failOnError: true
-                }
+                ]
             },
-
             css: {
                 test: /\.css$/,
-                use: ExtractTextPlugin.extract({
-                    use: {
-                        loader: 'css-loader'
-                    }
-                })
+                use: [MiniCssExtractPlugin.loader, 'css-loader']
             }
         }
     },
 
-
     bannerInfo: function (libName) {
         return `
          ${libName}.(${pkg.homepage})
@@ -89,8 +76,8 @@ module.exports = {
     plugins: function (libName, productName) {
         return [
             new webpack.BannerPlugin(this.bannerInfo(productName)),
-             new ExtractTextPlugin(`./${productName}.css`),
-            new webpack.NoEmitOnErrorsPlugin()
-        ]
+            new MiniCssExtractPlugin({filename:`./${productName}.css`}),
+            new ESLintPlugin({ failOnError: true, files: 'src' })
+        ];
     }
-};
+};

build/webpack.config.classic.js

@@ -26,7 +26,6 @@ module.exports = {
     module: {
         rules: (function () {
             let moduleRules = [];
-            moduleRules.push(configBase.module.rules.eslint);
             if (configBase.moduleVersion === "es5") {
                 //打包为es5相关配置
                 moduleRules.push({

build/webpack.config.leaflet.js

@@ -31,7 +31,6 @@ module.exports = {
         rules: (function () {
             let moduleRules = [];
             moduleRules.push(configBase.module.rules.img);
-            moduleRules.push(configBase.module.rules.eslint);
             if (configBase.moduleVersion === "es5") {
                 //打包为es5相关配置
                 moduleRules.push({

build/webpack.config.mapboxgl.js

@@ -35,7 +35,6 @@ module.exports = {
     rules: (function() {
       let moduleRules = [];
       moduleRules.push(configBase.module.rules.img);
-      moduleRules.push(configBase.module.rules.eslint);
       if (configBase.moduleVersion === 'es5') {
         //打包为es5相关配置
         moduleRules.push({

build/webpack.config.openlayers.js

@@ -48,7 +48,6 @@ module.exports = {
         rules: (function() {
             let moduleRules = [];
             moduleRules.push(configBase.module.rules.img);
-            moduleRules.push(configBase.module.rules.eslint);
             if (configBase.moduleVersion === 'es5') {
                 //打包为es5相关配置
                 moduleRules.push({