Skip to content

Commit ad29cee

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
去除dist/include文件包含es6语法 修改打包base entry引入顺序 review by luox
1 parent 09eb4ea commit ad29cee

14 files changed

+308
-291
lines changed

‎build/webpack.config.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function compareDependencies(pkgName, dependenciesToCompare, rootDependencies =
1616
});
1717
}
1818

19-
const packageToClients = ['common', 'classic', 'leaflet', 'openlayers', 'mapboxgl'];
19+
const packageToClients = ['common', 'classic', 'leaflet', 'openlayers', 'mapboxgl', 'maplibregl'];
2020
packageToClients.forEach(client => {
2121
// eslint-disable-next-line import/no-dynamic-require
2222
const clientPkg = require(`../src/${client}/package.json`);

‎build/webpack.config.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
target: configBase.target,
1010
mode: configBase.mode,
1111
//页面入口文件配置
12-
entry: [`${__dirname}/../src/classic/namespace.js`, ...configBase.entry],
12+
entry: [...configBase.entry, `${__dirname}/../src/classic/namespace.js`],
1313
//入口文件输出配置
1414
output: configBase.output(libName, productName),
1515
//是否启用压缩

‎build/webpack.config.leaflet.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
target: configBase.target,
99
mode: configBase.mode,
1010
//页面入口文件配置
11-
entry: [`${__dirname}/../src/leaflet/namespace.js`, `${__dirname}/../src/leaflet/css/index.js`, ...configBase.entry],
11+
entry: [...configBase.entry, `${__dirname}/../src/leaflet/namespace.js`, `${__dirname}/../src/leaflet/css/index.js`],
1212
//入口文件输出配置
1313
output: configBase.output(libName, productName),
1414
//是否启用压缩

‎build/webpack.config.mapboxgl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
target: configBase.target,
99
mode: configBase.mode,
1010
//页面入口文件配置
11-
entry: [`${__dirname}/../src/mapboxgl/namespace.js` ,`${__dirname}/../src/mapboxgl/css/index.js`, ...configBase.entry],
11+
entry: [...configBase.entry, `${__dirname}/../src/mapboxgl/namespace.js` ,`${__dirname}/../src/mapboxgl/css/index.js`],
1212
//入口文件输出配置
1313
output: configBase.output(libName, productName),
1414
//是否启用压缩

‎build/webpack.config.maplibregl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
target: configBase.target,
99
mode: configBase.mode,
1010
//页面入口文件配置
11-
entry: [`${__dirname}/../src/maplibregl/namespace.js`, ...configBase.entry],
11+
entry: [...configBase.entry, `${__dirname}/../src/maplibregl/namespace.js`],
1212
//入口文件输出配置
1313
output: configBase.output(libName, productName),
1414
//是否启用压缩

‎build/webpack.config.openlayers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = {
3939
target: configBase.target,
4040
mode: configBase.mode,
4141
//页面入口文件配置
42-
entry: [`${__dirname}/../src/openlayers/namespace.js`, `${__dirname}/../src/openlayers/css/index.js`, ...configBase.entry],
42+
entry: [...configBase.entry, `${__dirname}/../src/openlayers/namespace.js`, `${__dirname}/../src/openlayers/css/index.js`],
4343
//入口文件输出配置
4444
output: configBase.output(libName, productName),
4545
//是否启用压缩

‎dist/classic/include-classic.js

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,108 +49,110 @@
4949
}
5050

5151
//加载类库资源文件
52-
function load({ libsurl, disturl }) {
52+
function load(config) {
53+
var libsurl = config.libsurl;
54+
var disturl = config.disturl;
5355
var includes = (targetScript.getAttribute('include') || "").split(",");
5456
var excludes = (targetScript.getAttribute('exclude') || "").split(",");
5557
if (!inArray(excludes, 'iclient8c')) {
5658
if (!inArray(includes, 'iclient8c-plot')) {
5759
window.excludePlot = true;
5860
}
59-
inputScript(`${libsurl}/iclient8c/libs/SuperMap.Include.js`);
61+
inputScript(libsurl + '/iclient8c/libs/SuperMap.Include.js');
6062
}
6163
if (inArray(includes, 'mapv')) {
62-
inputScript(`${libsurl}/mapv/2.0.62/mapv.min.js`);
64+
inputScript(libsurl + '/mapv/2.0.62/mapv.min.js');
6365
}
6466
if (inArray(includes, 'echarts')) {
65-
inputScript(`${libsurl}/echarts/4.9.0/echarts.min.js`);
67+
inputScript(libsurl + '/echarts/4.9.0/echarts.min.js');
6668
}
6769
if (inArray(includes, 'nanoscroller')) {
68-
inputCSS(`${libsurl}/iclient8c/examples/css/nanoscroller.css`);
69-
inputScript(`${libsurl}/iclient8c/examples/js/jquery.nanoscroller.min.js`);
70+
inputCSS(libsurl + '/iclient8c/examples/css/nanoscroller.css');
71+
inputScript(libsurl + '/iclient8c/examples/js/jquery.nanoscroller.min.js');
7072
}
7173
if (inArray(includes, 'infoWindow')) {
72-
inputCSS(`${libsurl}/iclient8c/examples/js/plugins/infoWindow/infoWindow.css`);
73-
inputScript(`${libsurl}/iclient8c/examples/js/plugins/infoWindow/InfoWindow.js`);
74+
inputCSS(libsurl + '/iclient8c/examples/js/plugins/infoWindow/infoWindow.css');
75+
inputScript(libsurl + '/iclient8c/examples/js/plugins/infoWindow/InfoWindow.js');
7476
}
7577
if (inArray(includes, 'heatmapColorCSS')) {
76-
inputCSS(`${libsurl}/iclient8c/examples/css/heatmap.css`);
78+
inputCSS(libsurl + '/iclient8c/examples/css/heatmap.css');
7779
}
7880
if (!inArray(excludes, 'iclient-classic')) {
7981
if (supportES6()) {
80-
inputScript(`${disturl}/classic/iclient-classic-es6.min.js`);
82+
inputScript(disturl + '/classic/iclient-classic-es6.min.js');
8183
} else {
82-
inputScript(`${disturl}/classic/iclient-classic.min.js`);
84+
inputScript(disturl + '/classic/iclient-classic.min.js');
8385
}
8486
}
8587
if (inArray(includes, 'tianditu')) {
86-
inputScript(`${libsurl}/iclient8c/examples/js/layer/Tianditu.js`);
88+
inputScript(libsurl + '/iclient8c/examples/js/layer/Tianditu.js');
8789
}
8890
if (inArray(includes, 'echarts-all')) {
89-
inputScript(`${libsurl}/iclient8c/examples/js/echarts-all.js`);
91+
inputScript(libsurl + '/iclient8c/examples/js/echarts-all.js');
9092
}
9193
if (inArray(includes, 'baidu')) {
92-
inputScript(`${libsurl}/iclient8c/examples/js/layer/Baidu.js`);
94+
inputScript(libsurl + '/iclient8c/examples/js/layer/Baidu.js');
9395
}
9496
if (inArray(includes, 'OSMBuildings-SuperMap')) {
95-
inputScript(`${libsurl}/iclient8c/examples/js/OSMBuildings-SuperMap.js`);
97+
inputScript(libsurl + '/iclient8c/examples/js/OSMBuildings-SuperMap.js');
9698
}
9799
if (inArray(includes, 'D3WindMap')) {
98-
inputScript(`${libsurl}/iclient8c/examples/js/D3WindMap.js`);
100+
inputScript(libsurl + '/iclient8c/examples/js/D3WindMap.js');
99101
}
100102
if (inArray(includes, 'd3')) {
101-
inputScript(`${libsurl}/iclient8c/examples/js/d3.v3.min.js`);
103+
inputScript(libsurl + '/iclient8c/examples/js/d3.v3.min.js');
102104
}
103105
if (inArray(includes, 'three')) {
104-
inputScript(`${libsurl}/iclient8c/examples/js/third-party/Three/ThreeWebGL.js`);
105-
inputScript(`${libsurl}/iclient8c/examples/js/third-party/Three/ThreeExtras.js`);
106-
inputScript(`${libsurl}/iclient8c/examples/js/third-party/Three/RequestAnimationFrame.js`);
107-
inputScript(`${libsurl}/iclient8c/examples/js/third-party/Three/Detector.js`);
108-
inputScript(`${libsurl}/iclient8c/examples/js/third-party/globe.js`);
106+
inputScript(libsurl + '/iclient8c/examples/js/third-party/Three/ThreeWebGL.js');
107+
inputScript(libsurl + '/iclient8c/examples/js/third-party/Three/ThreeExtras.js');
108+
inputScript(libsurl + '/iclient8c/examples/js/third-party/Three/RequestAnimationFrame.js');
109+
inputScript(libsurl + '/iclient8c/examples/js/third-party/Three/Detector.js');
110+
inputScript(libsurl + '/iclient8c/examples/js/third-party/globe.js');
109111
}
110112
if (inArray(includes, 'MapToImg')) {
111-
inputScript(`${libsurl}/iclient8c/examples/js/MapToImg.js`);
113+
inputScript(libsurl + '/iclient8c/examples/js/MapToImg.js');
112114
}
113115
if (inArray(includes, 'Bar')) {
114-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Bar.js`);
116+
inputScript(libsurl + '/iclient8c/examples/js/graph/Bar.js');
115117
}
116118
if (inArray(includes, 'Bar3D')) {
117-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Bar3D.js`);
119+
inputScript(libsurl + '/iclient8c/examples/js/graph/Bar3D.js');
118120
}
119121
if (inArray(includes, 'Circle')) {
120-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Circle.js`);
122+
inputScript(libsurl + '/iclient8c/examples/js/graph/Circle.js');
121123
}
122124
if (inArray(includes, 'Line')) {
123-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Line.js`);
125+
inputScript(libsurl + '/iclient8c/examples/js/graph/Line.js');
124126
}
125127
if (inArray(includes, 'Pie')) {
126-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Pie.js`);
128+
inputScript(libsurl + '/iclient8c/examples/js/graph/Pie.js');
127129
}
128130
if (inArray(includes, 'Point')) {
129-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Point.js`);
131+
inputScript(libsurl + '/iclient8c/examples/js/graph/Point.js');
130132
}
131133
if (inArray(includes, 'Ring')) {
132-
inputScript(`${libsurl}/iclient8c/examples/js/graph/Ring.js`);
134+
inputScript(libsurl + '/iclient8c/examples/js/graph/Ring.js');
133135
}
134136
if (inArray(includes, 'style')) {
135-
inputCSS(`${libsurl}/iclient8c/theme/default/style.css`);
137+
inputCSS(libsurl + '/iclient8c/theme/default/style.css');
136138
}
137139
if (inArray(includes, 'sm-doc')) {
138-
inputCSS(`${libsurl}/iclient8c/examples/css/sm-doc.css`);
140+
inputCSS(libsurl + '/iclient8c/examples/css/sm-doc.css');
139141
}
140142
if (inArray(includes, 'LargeFormatPrints')) {
141-
inputScript(`${libsurl}/iclient8c/examples/js/LargeFormatPrints.js`);
143+
inputScript(libsurl + '/iclient8c/examples/js/LargeFormatPrints.js');
142144
}
143145
if (inArray(includes, 'PlottingPanel')) {
144-
inputScript(`${libsurl}/iclient8c/examples/js/plottingPanel/PlottingPanel.Include.js`);
146+
inputScript(libsurl + '/iclient8c/examples/js/plottingPanel/PlottingPanel.Include.js');
145147
}
146148
if (inArray(includes, 'bevInclude')) {
147-
inputScript(`${libsurl}/iclient8c/examples/js/bevInclude.js`);
149+
inputScript(libsurl + '/iclient8c/examples/js/bevInclude.js');
148150
}
149151
if (inArray(includes, 'DefaultStyleConfiguration')) {
150-
inputScript(`${libsurl}/iclient8c/resource/Plugins/Plotting/DefaultStyleConfiguration.js`);
152+
inputScript(libsurl + '/iclient8c/resource/Plugins/Plotting/DefaultStyleConfiguration.js');
151153
}
152154
if (inArray(includes, 'tensorflow')) {
153-
inputScript(`${libsurl}/tensorflow/3.9.0/tf.min.js`);
155+
inputScript(libsurl + '/tensorflow/3.9.0/tf.min.js');
154156
}
155157
}
156158

0 commit comments

Comments
 (0)