Skip to content

Commit a0a7429

Browse files
songyumengsongyumeng
authored
Merge branch 'master' into dependabot/npm_and_yarn/proj4-2.6.0
2 parents 7752a34 + 68b7608 commit a0a7429

File tree

1,545 files changed

+225769
-15017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,545 files changed

+225769
-15017
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 10.0.1 #
2+
3+
4+
15
# 10.0.0 #
26

37
## Distribution package changes

‎build/webpack.config.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ module.exports = {
8080
bannerInfo: function (libName) {
8181
return `
8282
${libName}.(${pkg.homepage})
83-
Copyright© 2000 - 2019 SuperMap Software Co.Ltd
83+
Copyright© 2000 - 2020 SuperMap Software Co.Ltd
8484
license: ${pkg.license}
8585
version: v${pkg.version}
8686
`;

‎build/webpack.config.openlayers.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ var libName = 'openlayers';
44
//产品包名
55
var productName = 'iclient-openlayers';
66

7+
var argv = JSON.parse(process.env['npm_config_argv']);
8+
var origin = argv.original;
9+
if (origin && origin.includes('deploy-ol')) {
10+
libName = 'ol';
11+
productName = 'iclient-ol';
12+
}
713
var externals = [
814
Object.assign({}, configBase.externals, {
915
'@turf/turf': 'function(){try{return turf}catch(e){return {}}}()',

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy